diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-14 00:29:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-14 00:29:28 +0100 |
| commit | a6a4671df0a6405f1ec8b03eebab90f55c909625 (patch) | |
| tree | 4e24410bdd1eae4ce293b2921fad0f1eb6d86f63 /src/lib | |
| parent | 6c3ce5b236a745c9eb9e652bacb2896a96254f81 (diff) | |
| parent | 37b1945ffd8c9b3084d08dbdc274c8841d9162eb (diff) | |
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffmpeg.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index 63fe9c9d8..4eee08992 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -138,9 +138,6 @@ FFmpeg::setup_general () for (uint32_t i = 0; i < _format_context->nb_streams; ++i) { AVStream* s = _format_context->streams[i]; - /* 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) { if (s->avg_frame_rate.num > 0 && s->avg_frame_rate.den > 0) { /* This is definitely our video stream */ |