diff options
| author | Nick Kurshev <nickols_k@mail.ru> | 2002-06-03 07:58:35 +0000 |
|---|---|---|
| committer | Nick Kurshev <nickols_k@mail.ru> | 2002-06-03 07:58:35 +0000 |
| commit | 8696b636452869c37cbe0725b40dfbdac4c41d2e (patch) | |
| tree | 592f3993131e458397f5eef2fed025f3e296d741 /libavcodec | |
| parent | ae72cda62bfdf657a6edcd2a19f001cf54b53dee (diff) | |
| download | ffmpeg-8696b636452869c37cbe0725b40dfbdac4c41d2e.tar.gz | |
use qstride instead of fixed constants
Originally committed as revision 653 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 7 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index bdf7062f3b..5442ede009 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -5,8 +5,8 @@ #define LIBAVCODEC_VERSION_INT 0x000406 #define LIBAVCODEC_VERSION "0.4.6" -#define LIBAVCODEC_BUILD 4612 -#define LIBAVCODEC_BUILD_STR "4612" +#define LIBAVCODEC_BUILD 4613 +#define LIBAVCODEC_BUILD_STR "4613" enum CodecID { CODEC_ID_NONE, @@ -245,6 +245,7 @@ typedef struct AVCodecContext { #define MBR 96 #endif int *quant_store; /* field for communicating with external postprocessing */ + unsigned qstride; //FIXME this should be reordered after kabis API is finished ... /* Note: Below are located reserved fields for further usage @@ -268,7 +269,7 @@ typedef struct AVCodecContext { ul_res6,ul_res7,ul_res8,ul_res9,ul_res10,ul_res11,ul_res12; unsigned int ui_res0,ui_res1,ui_res2,ui_res3,ui_res4,ui_res5, - ui_res6,ui_res7; + ui_res6; unsigned short int us_res0,us_res1,us_res2,us_res3,us_res4,us_res5, us_res6,us_res7,us_res8,us_res9,us_res10,us_res11,us_res12; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f0f87fb81f..f63b24b33d 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1182,7 +1182,7 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) quant_store[mb_y][mb_x]=s->qscale; //printf("[%02d][%02d] %d\n",mb_x,mb_y,s->qscale); #else - if(s->avctx->quant_store) s->avctx->quant_store[mb_y*(MBR+1)+mb_x] = s->qscale; + if(s->avctx->quant_store) s->avctx->quant_store[mb_y*s->avctx->qstride+mb_x] = s->qscale; #endif /* update DC predictors for P macroblocks */ |