Bump ffmpeg version.

diff --git a/ChangeLog b/ChangeLog
index d5d6d020d4a86f3561fa55a08387e7e9c00b340e..6157e278373c31afefd9fcbb0b77488192258a41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2013-11-16  Carl Hetherington  <cth@carlh.net>
 
+       * Bump bundled FFmpeg version to current git master.
+
        * Fix erroneous reset of visible channels in audio
        level dialog when changing gain.
 

diff --git a/cscript b/cscript
index b82e0ad7751a4a59248a25a724cf21534bf66150..875b590d129869b08436cdf3493a911c56c924e9 100644 (file)
--- a/cscript
+++ b/cscript
@@ -3,7 +3,7 @@ import shutil
 import os
 
 def dependencies(target):
-    return (('ffmpeg-cdist', 'b1219246a0cce9a4b916669d506bb33c925225c3'),
+    return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'),
             ('libdcp', '658695856029c7ae80e3556d07a1a5cb1b51cf1d'))
 
 def build(target):

diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index 24c91880b2b67aabd391987fa1159bd1d13496bb..a3b9bb4f6506793186b1aff886f68f67c07d6662 100644 (file)
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/ffmpeg_examiner_test.cc
@@ -30,7 +30,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test)
        shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd24.m2ts"));
        shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (content));
 
-       BOOST_CHECK_EQUAL (examiner->first_video().get(), 600.04166666666674);
+       BOOST_CHECK_EQUAL (examiner->first_video().get(), 600);
        BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1);
        BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.get(), 600);
 }