Commit fcfee63b authored by Michael Niedermayer's avatar Michael Niedermayer

split ff_h263_decode_mb() into h263 and mpeg4 versions

Originally committed as revision 2554 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3615e2be
This diff is collapsed.
...@@ -55,6 +55,7 @@ int ff_h263_decode_init(AVCodecContext *avctx) ...@@ -55,6 +55,7 @@ int ff_h263_decode_init(AVCodecContext *avctx)
s->unrestricted_mv= 0; s->unrestricted_mv= 0;
break; break;
case CODEC_ID_MPEG4: case CODEC_ID_MPEG4:
s->decode_mb= ff_mpeg4_decode_mb;
s->time_increment_bits = 4; /* default value for broken headers */ s->time_increment_bits = 4; /* default value for broken headers */
s->h263_pred = 1; s->h263_pred = 1;
s->low_delay = 0; //default, might be overriden in the vol header during header parsing 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){ ...@@ -160,7 +161,7 @@ static int decode_slice(MpegEncContext *s){
s->first_slice_line=1; s->first_slice_line=1;
s->mb_x= s->resync_mb_x; s->mb_x= s->resync_mb_x;
s->mb_y= s->resync_mb_y; 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->y_dc_scale= s->y_dc_scale_table[ s->qscale ];
s->c_dc_scale= s->c_dc_scale_table[ s->qscale ]; s->c_dc_scale= s->c_dc_scale_table[ s->qscale ];
} }
......
...@@ -858,6 +858,8 @@ int intel_h263_decode_picture_header(MpegEncContext *s); ...@@ -858,6 +858,8 @@ int intel_h263_decode_picture_header(MpegEncContext *s);
int flv_h263_decode_picture_header(MpegEncContext *s); int flv_h263_decode_picture_header(MpegEncContext *s);
int ff_h263_decode_mb(MpegEncContext *s, int ff_h263_decode_mb(MpegEncContext *s,
DCTELEM block[6][64]); DCTELEM block[6][64]);
int ff_mpeg4_decode_mb(MpegEncContext *s,
DCTELEM block[6][64]);
int h263_get_picture_format(int width, int height); int h263_get_picture_format(int width, int height);
void ff_mpeg4_encode_video_packet_header(MpegEncContext *s); void ff_mpeg4_encode_video_packet_header(MpegEncContext *s);
void ff_mpeg4_clean_buffers(MpegEncContext *s); void ff_mpeg4_clean_buffers(MpegEncContext *s);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment