diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-06 20:31:05 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-06 20:31:05 +0000 |
| commit | 7561918187d51eadcd59904a71c1eda30cc6ab31 (patch) | |
| tree | 1479f169db1ab5ca67d941e0a23c8bf8de478e6e | |
| parent | 830decc4642f33ebe3cd0a07bce27f0ea73f0e6f (diff) | |
Improve logging slightly.
| -rw-r--r-- | doc/manual/screenshots/click-content-selector.png | bin | 10600 -> 32701 bytes | |||
| -rw-r--r-- | doc/manual/screenshots/examine-thumbs.png | bin | 367452 -> 264474 bytes | |||
| -rw-r--r-- | doc/manual/screenshots/file-new.png | bin | 8759 -> 7906 bytes | |||
| -rw-r--r-- | doc/manual/screenshots/making-dcp.png | bin | 19207 -> 20676 bytes | |||
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 6 |
5 files changed, 3 insertions, 3 deletions
diff --git a/doc/manual/screenshots/click-content-selector.png b/doc/manual/screenshots/click-content-selector.png Binary files differindex 556232e35..1072c7eff 100644 --- a/doc/manual/screenshots/click-content-selector.png +++ b/doc/manual/screenshots/click-content-selector.png diff --git a/doc/manual/screenshots/examine-thumbs.png b/doc/manual/screenshots/examine-thumbs.png Binary files differindex bd52e6648..3eae1fbd7 100644 --- a/doc/manual/screenshots/examine-thumbs.png +++ b/doc/manual/screenshots/examine-thumbs.png diff --git a/doc/manual/screenshots/file-new.png b/doc/manual/screenshots/file-new.png Binary files differindex d9c6d0204..f3dae7e2e 100644 --- a/doc/manual/screenshots/file-new.png +++ b/doc/manual/screenshots/file-new.png diff --git a/doc/manual/screenshots/making-dcp.png b/doc/manual/screenshots/making-dcp.png Binary files differindex b08c6862d..291e5f405 100644 --- a/doc/manual/screenshots/making-dcp.png +++ b/doc/manual/screenshots/making-dcp.png diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 075420b7c..5f7e0d1c7 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -292,8 +292,8 @@ FFmpegDecoder::pass () repeat_last_video (); _film->log()->log ( String::compose ( - "Extra frame inserted at %1s; source frame %2, source PTS %3", - out_pts_seconds, video_frame(), source_pts_seconds + "Extra video frame inserted at %1s; source frame %2, source PTS %3 (at %4 fps)", + out_pts_seconds, video_frame(), source_pts_seconds, frames_per_second() ) ); } @@ -336,7 +336,7 @@ FFmpegDecoder::pass () _film->log()->log ( String::compose ( - "First video at %1, first audio at %2, pushing %3 frames of silence for %4 channels (%5 bytes per sample)", + "First video at %1, first audio at %2, pushing %3 audio frames of silence for %4 channels (%5 bytes per sample)", _first_video.get(), _first_audio.get(), s, ffa->channels(), bytes_per_audio_sample() ) ); |
