diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-03-01 12:16:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-03-01 12:16:36 +0100 |
| commit | d5960f1da64e08b01e799b65655c4e6a60a2b8ce (patch) | |
| tree | d5d1faf9589ccaab04d2af04cf0a1894b4ff87e5 /src/lib | |
| parent | cc40b6ea6d882c07c05602d6f3dd1c185481585b (diff) | |
Fix crash introduced in previous.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffmpeg_examiner.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index e93a83312..4498fa698 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -118,8 +118,6 @@ DCPOMATIC_DISABLE_WARNINGS */ int64_t const len = _file_group.length (); - auto context = _format_context->streams[_packet.stream_index]->codec; -DCPOMATIC_ENABLE_WARNINGS /* A string which we build up to describe the top-field-first and repeat-first-frame values for the first few frames. * It would be nicer to use something like vector<bool> here but we want to search the array for a pattern later, * and a string seems a reasonably neat way to do that. @@ -139,6 +137,9 @@ DCPOMATIC_ENABLE_WARNINGS } } + auto context = _format_context->streams[_packet.stream_index]->codec; +DCPOMATIC_ENABLE_WARNINGS + if (_video_stream && _packet.stream_index == _video_stream.get()) { video_packet (context, temporal_reference); } @@ -164,8 +165,9 @@ DCPOMATIC_ENABLE_WARNINGS _packet.data = nullptr; _packet.size = 0; - while (video_packet(context, temporal_reference)) {} /* XXX: I'm not sure this makes any sense: how does _packet.stream_index get the right value here? */ + auto context = _format_context->streams[_packet.stream_index]->codec; + while (video_packet(context, temporal_reference)) {} for (size_t i = 0; i < _audio_streams.size(); ++i) { if (_audio_streams[i]->uses_index (_format_context, _packet.stream_index)) { audio_packet (context, _audio_streams[i]); |