diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-05-16 14:47:25 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-05-16 14:47:25 +0100 |
| commit | 2573e7dbeb2035967866dc57747f881c43d9678e (patch) | |
| tree | 08646c69a35c049bca6dea52997e730ebbb29fc4 | |
| parent | 9cc1ad12d7a936227d82f49a829713ca025a6bd6 (diff) | |
| download | xine-lib-2573e7dbeb2035967866dc57747f881c43d9678e.tar.gz xine-lib-2573e7dbeb2035967866dc57747f881c43d9678e.tar.bz2 | |
Complete the adaptation to libavcodec 0.7. (Hopefully.)
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 7 |
1 files 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 |