summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-23 22:37:33 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-23 22:37:33 +0000
commiteed40e4e5ca46bbc31a9833d2b766c96c11b0254 (patch)
treea7c39c06fa3ea3d800faa61d1c0b1642919053f7
parent52c2b917ea802f7259599a0ef0c02098b1c35b6d (diff)
Bump ffmpeg library to fix problems with misrecognised frame rates in some MOV files.
-rw-r--r--ChangeLog5
-rw-r--r--cscript2
-rw-r--r--src/wx/about_dialog.cc1
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ce5f2c705..ba4cf9377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-23 Carl Hetherington <cth@carlh.net>
+
+ * Bump ffmpeg library to git head to fix problems with
+ misrecognised frame rates in some MOV files.
+
2014-02-20 Carl Hetherington <cth@carlh.net>
* Version 1.64.15 released.
diff --git a/cscript b/cscript
index e75790e9e..14e3347a1 100644
--- a/cscript
+++ b/cscript
@@ -129,7 +129,7 @@ def make_control(debian_version, bits, filename, debug):
print >>f,''
def dependencies(target):
- return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'),
+ return (('ffmpeg-cdist', '08827fa4e1d483511e6135c424d2ca9c56a9ed50'),
('libdcp', '5839998'))
def build(target, options):
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index d169db971..d24032849 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -163,6 +163,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
testers.Add (wxT ("Pepijn Klijs"));
testers.Add (wxT ("Will Meadows"));
testers.Add (wxT ("Adam Colt"));
+ testers.Add (wxT ("Markus Raab"));
add_section (_("Tested by"), testers);
sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16).Expand());