diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-12 13:47:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-12 13:47:35 +0100 |
| commit | bdbfd6b08856a445446bfd845f1c43109d184250 (patch) | |
| tree | b894142ddd3e6dfc16c4b934e730f0ef9b518646 /src/lib/ffmpeg_decoder.cc | |
| parent | ad27e9acc3d99a29fdc358da62feb603983f8882 (diff) | |
Remove PassReason stuff.
This feels wrong: it means that it is possible for FFmpegDecoder
to discard packets. I can't see how this is ok in all cases:
maybe we were lucky that it worked at all.
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 416ac0248..6f91922eb 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -137,7 +137,7 @@ FFmpegDecoder::flush () } bool -FFmpegDecoder::pass (PassReason reason) +FFmpegDecoder::pass () { int r = av_read_frame (_format_context, &_packet); @@ -160,11 +160,11 @@ FFmpegDecoder::pass (PassReason reason) int const si = _packet.stream_index; shared_ptr<const FFmpegContent> fc = _ffmpeg_content; - if (si == _video_stream && !_ignore_video && reason != PASS_REASON_SUBTITLE) { + if (si == _video_stream && !_ignore_video) { decode_video_packet (); } else if (fc->subtitle_stream() && fc->subtitle_stream()->uses_index (_format_context, si)) { decode_subtitle_packet (); - } else if (reason != PASS_REASON_SUBTITLE) { + } else { decode_audio_packet (); } |
