diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-22 10:10:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-22 10:10:54 +0100 |
| commit | f90d74f7a0382f0dc63eef81bd553d7a7b38edb2 (patch) | |
| tree | b4f495accfc6f697563ec1931e75acd5c8b89ce4 | |
| parent | 4b06a77805ea3fd7bc0829d8096f87b341c77832 (diff) | |
| parent | a7601beaa8983c9d012d9230ce66aa861f34e67f (diff) | |
Merge master.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | src/lib/ffmpeg.cc | 5 | ||||
| -rw-r--r-- | src/wx/about_dialog.cc | 1 |
4 files changed, 16 insertions, 2 deletions
@@ -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 9842aacb1..aa4a34921 100644 --- 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 fa369dda4..4fe1c0448 100644 --- 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 1bbcaba79..dbf502289 100644 --- 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")); |