summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd_ffmpeg.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-07 16:12:30 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-07 16:12:30 +0000
commitbd18a2b995c2beb4842f5f66c76bc1310ae0a98a (patch)
tree6ec0db5537f43422d0b11db4d12d52e09e8426f3 /libmpcodecs/vd_ffmpeg.c
parent192e0f0fb675cf9418c76ef27ddeef5ce533c3d5 (diff)
downloadmpv-bd18a2b995c2beb4842f5f66c76bc1310ae0a98a.tar.bz2
mpv-bd18a2b995c2beb4842f5f66c76bc1310ae0a98a.tar.xz
support avcontext based quant_store export
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6666 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_ffmpeg.c')
-rw-r--r--libmpcodecs/vd_ffmpeg.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 0986b083fe..efc2eb465c 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -289,7 +289,15 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
mpi->stride[2]*=2;
}
-#ifdef FF_POSTPROCESS
+/* to comfirm with newer lavc style */
+#if !defined(FF_POSTPROCESS) && (LIBAVCODEC_BUILD > 4612)
+ mpi->qscale=avctx->quant_store;
+#if LIBAVCODEC_BUILD > 4613
+ mpi->qstride=avctx->qstride;
+#else
+ mpi->qstride=MBC+1;
+#endif
+#else ifdef FF_POSTPROCESS
mpi->qscale=&quant_store[0][0];
mpi->qstride=MBC+1;
#endif