diff options
| author | Torsten Jager <t.jager@gmx.de> | 2014-03-13 00:45:55 +0100 |
|---|---|---|
| committer | Torsten Jager <t.jager@gmx.de> | 2014-03-13 00:45:55 +0100 |
| commit | 4fdfc8bae58a0e591ee038755201a297eb9b610c (patch) | |
| tree | 289e911e3ec5794deb483852132aebfb32be12f4 | |
| parent | 2a148faa7661cf233007ae9edb64152c1f90c338 (diff) | |
| download | xine-lib-4fdfc8bae58a0e591ee038755201a297eb9b610c.tar.gz xine-lib-4fdfc8bae58a0e591ee038755201a297eb9b610c.tar.bz2 | |
Fix build regression #12508.
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index e409b1ee3..7e9d375db 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -1711,16 +1711,23 @@ static void ff_handle_mpeg12_buffer (ff_video_decoder_t *this, buf_element_t *bu } } -static void ff_postprocess (ff_video_decoder_t *this, vo_frame_t *img) -{ +static void ff_postprocess (ff_video_decoder_t *this, vo_frame_t *img) { int qstride, qtype; int8_t *qtable; -#if LIBAVUTIL_VERSION_MAJOR < 53 +#ifdef AV_BUFFER +# if LIBAVUTIL_VERSION_MAJOR < 53 qtable = av_frame_get_qp_table (this->av_frame, &qstride, &qtype); -#else +# else + /* Why should they keep these long deprecated fields, and remove + their safe accessor av_frame_get_qp_table () instead?? */ qtable = this->av_frame->qscale_table; qstride = this->av_frame->qstride; qtype = this->av_frame->qscale_type; +# endif +#else + qtable = this->av_frame->qscale_table; + qstride = this->av_frame->qstride; + qtype = 0; #endif pp_postprocess ((const uint8_t **)this->av_frame->data, this->av_frame->linesize, img->base, img->pitches, this->bih.biWidth, this->bih.biHeight, |