From 2573e7dbeb2035967866dc57747f881c43d9678e Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Mon, 16 May 2011 14:47:25 +0100 Subject: Complete the adaptation to libavcodec 0.7. (Hopefully.) --- src/combined/ffmpeg/ff_video_decoder.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 405871b04..b20ccad70 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -1052,7 +1052,7 @@ static void ff_handle_mpeg12_buffer (ff_video_decoder_t *this, buf_element_t *bu /* skip decoding b frames if too late */ #if AVVIDEO > 1 - /* FIXME: alternative for avcodec_decode_video2? */ + this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; #else this->context->hurry_up = (this->skipframes > 0); #endif @@ -1124,8 +1124,7 @@ static void ff_handle_mpeg12_buffer (ff_video_decoder_t *this, buf_element_t *bu if ( #if AVVIDEO > 1 - /* FIXME: alternative for avcodec_decode_video2? */ - this->skipframes + this->context->skip_frame != AVDISCARD_DEFAULT #else this->context->hurry_up #endif @@ -1318,7 +1317,7 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { } else { /* skip decoding b frames if too late */ #if AVVIDEO > 1 - /* FIXME: alternative for avcodec_decode_video2? */ + this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; #else this->context->hurry_up = (this->skipframes > 0); #endif -- cgit v1.2.3