summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-09 16:02:07 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-09 16:02:07 +0100
commitf29219ed06d27dcae5e18b8b9c52dcf24554f188 (patch)
tree13745dfe70156b7dae616f8a7e83013a43826c91 /src/lib/ffmpeg_decoder.cc
parente73d64612c12f2027a91fa2061992aeec3c4bb60 (diff)
Remove unused variable.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
-rw-r--r--src/lib/ffmpeg_decoder.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 1096bb253..3991323ce 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -172,10 +172,8 @@ FFmpegDecoder::do_pass ()
int frame_finished;
- if (_opt->decode_video) {
- while (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
- process_video (_frame);
- }
+ while (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
+ process_video (_frame);
}
if (_audio_stream >= 0 && _opt->decode_audio) {
@@ -192,7 +190,7 @@ FFmpegDecoder::do_pass ()
return true;
}
- if (_packet.stream_index == _video_stream && _opt->decode_video) {
+ if (_packet.stream_index == _video_stream) {
int frame_finished;
if (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {