highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

exporting mbskip_table after it has been allocated

Browse Source 
Originally committed as revision 768 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2002-07-16 11:45:14 +00:00
parent bc6d7776d8
commit fe072fb4ee
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/h263dec.c
View File

@ -88,7 +88,6 @@ static int h263_decode_init(AVCodecContext *avctx)
return -1; return -1;
} }
s->codec_id= avctx->codec->id; s->codec_id= avctx->codec->id;
avctx->mbskip_table= s->mbskip_table;
/* for h263, we allocate the images after having read the header */ /* for h263, we allocate the images after having read the header */
if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4) if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4)

6
libavcodec/mpegvideo.c
View File

@ -619,6 +619,7 @@ void MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
s->mb_skiped = 0; s->mb_skiped = 0;
s->decoding_error=0; s->decoding_error=0;
avctx->mbskip_table= s->mbskip_table;
if(avctx->flags&CODEC_FLAG_DR1){ if(avctx->flags&CODEC_FLAG_DR1){
int i; int i;
@ -628,6 +629,7 @@ void MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
s->uvlinesize= avctx->dr_uvstride; s->uvlinesize= avctx->dr_uvstride;
s->ip_buffer_count= avctx->dr_ip_buffer_count; s->ip_buffer_count= avctx->dr_ip_buffer_count;
} }
avctx->dr_ip_buffer_count= s->ip_buffer_count;
if (s->pict_type == B_TYPE) { if (s->pict_type == B_TYPE) {
for(i=0;i<3;i++) { for(i=0;i<3;i++) {
@ -1444,8 +1446,8 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
} }
dest_y = s->current_picture [0] + (mb_y * 16* s->linesize ) + mb_x * 16; dest_y = s->current_picture [0] + (mb_y * 16* s->linesize ) + mb_x * 16;
dest_cb = s->current_picture[1] + (mb_y * 8 * (s->uvlinesize)) + mb_x * 8; dest_cb = s->current_picture[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
dest_cr = s->current_picture[2] + (mb_y * 8 * (s->uvlinesize)) + mb_x * 8; dest_cr = s->current_picture[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
if (s->interlaced_dct) { if (s->interlaced_dct) {
dct_linesize = s->linesize * 2; dct_linesize = s->linesize * 2;