summaryrefslogtreecommitdiff
path: root/libavcodec/h263dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2003-12-03 01:16:35 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-12-03 01:16:35 +0000
commitfcfee63b122f051e759acb661cc13e74eeafc57e (patch)
tree73164d392d97d2de482f6a6cbc0673ffc683156b /libavcodec/h263dec.c
parent3615e2be846f6382aa42360d02d16b25f443af9f (diff)
split ff_h263_decode_mb() into h263 and mpeg4 versions
Originally committed as revision 2554 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263dec.c')
-rw-r--r--libavcodec/h263dec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 8ca0a3ae5a..8a8dafb554 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -55,6 +55,7 @@ int ff_h263_decode_init(AVCodecContext *avctx)
s->unrestricted_mv= 0;
break;
case CODEC_ID_MPEG4:
+ s->decode_mb= ff_mpeg4_decode_mb;
s->time_increment_bits = 4; /* default value for broken headers */
s->h263_pred = 1;
s->low_delay = 0; //default, might be overriden in the vol header during header parsing
@@ -160,7 +161,7 @@ static int decode_slice(MpegEncContext *s){
s->first_slice_line=1;
s->mb_x= s->resync_mb_x;
s->mb_y= s->resync_mb_y;
- s->qscale= qscale;
+ s->chroma_qscale= s->qscale= qscale;
s->y_dc_scale= s->y_dc_scale_table[ s->qscale ];
s->c_dc_scale= s->c_dc_scale_table[ s->qscale ];
}