X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fmpegvideo.c;h=63a30b93ce9492ba8b4e38e8ddb554ddc985fd8a;hp=e5424cbacfd5b04f207beb641c62786c1524e70e;hb=f670c13f13999d268c2d565d2e161d6a32fa9715;hpb=b9d0a5fc215febfaa0c5b1ce5b0a799d59dd2a03 diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index e5424cbacf..63a30b93ce 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -2471,7 +2471,7 @@ void ff_clean_intra_table_entries(MpegEncContext *s) s->interlaced_dct : true if interlaced dct used (mpeg2) */ static av_always_inline -void mpv_decode_mb_internal(MpegEncContext *s, int16_t block[12][64], +void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], int lowres_flag, int is_mpeg12) { const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; @@ -2719,16 +2719,16 @@ skip_idct: } } -void ff_mpv_decode_mb(MpegEncContext *s, int16_t block[12][64]) +void ff_mpv_reconstruct_mb(MpegEncContext *s, int16_t block[12][64]) { #if !CONFIG_SMALL if(s->out_format == FMT_MPEG1) { - if(s->avctx->lowres) mpv_decode_mb_internal(s, block, 1, 1); - else mpv_decode_mb_internal(s, block, 0, 1); + if(s->avctx->lowres) mpv_reconstruct_mb_internal(s, block, 1, 1); + else mpv_reconstruct_mb_internal(s, block, 0, 1); } else #endif - if(s->avctx->lowres) mpv_decode_mb_internal(s, block, 1, 0); - else mpv_decode_mb_internal(s, block, 0, 0); + if(s->avctx->lowres) mpv_reconstruct_mb_internal(s, block, 1, 0); + else mpv_reconstruct_mb_internal(s, block, 0, 0); } void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h)