diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-30 20:50:33 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-30 20:50:33 +0000 |
| commit | 31642e274476f8a068e0110675b2ad16b345ec78 (patch) | |
| tree | bec8990c3a1390298de5a9e89ffc7c15d40d5224 /libmpcodecs | |
| parent | d200725e8801ae1afb64f8a5c09f271fcc4d9653 (diff) | |
| download | mpv-31642e274476f8a068e0110675b2ad16b345ec78.tar.bz2 mpv-31642e274476f8a068e0110675b2ad16b345ec78.tar.xz | |
change qscale type to int8 and fix qscale ordering
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7985 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/mp_image.h | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/libmpcodecs/mp_image.h b/libmpcodecs/mp_image.h index 8414aa47aa..f5a26ac5a2 100644 --- a/libmpcodecs/mp_image.h +++ b/libmpcodecs/mp_image.h @@ -73,7 +73,7 @@ typedef struct mp_image_s { int x,y,w,h; // visible dimensions unsigned char* planes[MP_MAX_PLANES]; unsigned int stride[MP_MAX_PLANES]; - int* qscale; + char * qscale; int qstride; int pict_type; // 0->unknown, 1->I, 2->P, 3->B int num_planes; diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 1908089570..595c11a95d 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -619,16 +619,9 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ } /* to comfirm with newer lavc style */ -#if !defined(FF_POSTPROCESS) && (LIBAVCODEC_BUILD > 4612) - mpi->qscale=avctx->quant_store; -#if LIBAVCODEC_BUILD > 4613 +#if LIBAVCODEC_BUILD >= 4633 + mpi->qscale=avctx->display_qscale_table; mpi->qstride=avctx->qstride; -#else - mpi->qstride=MBC+1; -#endif -#elif defined(FF_POSTPROCESS) - mpi->qscale=&quant_store[0][0]; - mpi->qstride=MBC+1; #endif { |