Merge master.

diff --git a/ChangeLog b/ChangeLog
index 873ad89dffe7361b40e682306fd9abd0c55ebb09..78d6eb4d78d5e7e9616219a5341390c7462a1911 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-10-22  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.76.3 released.
+
+2014-10-22  Carl Hetherington  <cth@carlh.net>
+
+       * Fix bug where some files from iTunes would
+       be read as being at 90,000fps.
+
 2014-10-20  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.76.2 released.

diff --git a/debian/changelog b/debian/changelog
index 9842aacb1bde7a3ea88e935d98f511d924fcf1ec..aa4a34921cd89480802d8085b7f19ef8091e6055 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -193,8 +193,9 @@ dcpomatic (2.0.14-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 20 Oct 2014 22:50:32 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 22 Oct 2014 09:32:14 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index fa369dda429c9342c2b08eed7a4b74ee50a38c35..4fe1c04484ab38527db8bf67a051904e8fb60eee 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -106,7 +106,10 @@ FFmpeg::setup_general ()
 
        for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
                AVStream* s = _format_context->streams[i];
-               if (s->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+               /* Files from iTunes sometimes have two video streams, one with the avg_frame_rate.num and .den set
+                  to zero.  Ignore these streams.
+               */
+               if (s->codec->codec_type == AVMEDIA_TYPE_VIDEO && s->avg_frame_rate.num > 0 && s->avg_frame_rate.den > 0) {
                        _video_stream = i;
                }
        }

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 1bbcaba799c65518a6bd65e19b714575c52d034d..dbf502289cdf20e53b25b7ea82fea68c122cd9f2 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -151,6 +151,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Aldo Midali"));
        supported_by.Add (wxT ("Sylvain Mielle"));
        supported_by.Add (wxT ("Lindsay Morris"));
+       supported_by.Add (wxT ("David Nedrow"));
        supported_by.Add (wxT ("Tim O'Brien"));
        supported_by.Add (wxT ("Ivan Pullman"));
        supported_by.Add (wxT ("Mark Rolfe"));