diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-27 23:17:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-27 23:17:34 +0100 |
| commit | 90933dc804de225df47897ddd3a19c5a60ec67e0 (patch) | |
| tree | 4ab78073ea1899b7bd7934b7c592e5f8e01c7c87 /src/lib/ffmpeg_decoder.cc | |
| parent | f49d66270bff2577d39474a0c1c18a7a1b1f14f6 (diff) | |
Fix some DCP generation bugs and update some tests.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 119e82851..a1a6636fb 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -539,7 +539,7 @@ FFmpegDecoder::decode_audio_packet () ); assert (_audio_codec_context->channels == _ffmpeg_content->audio_channels()); - Audio (deinterleave_audio (_frame->data, data_size), source_pts_seconds); + audio (deinterleave_audio (_frame->data, data_size), source_pts_seconds); } copy_packet.data += decode_result; @@ -608,11 +608,11 @@ FFmpegDecoder::decode_video_packet () Time FFmpegDecoder::next () const { - if (_decode_video && _decode_audio) { + if (_decode_video && _decode_audio && _audio_codec_context) { return min (_next_video, _next_audio); } - if (_decode_audio) { + if (_decode_audio && _audio_codec_context) { return _next_audio; } |