git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avcodec: Rename ff_mpv_decode_mb() to ff_mpv_reconstruct_mb
[ffmpeg.git]
/
libavcodec
/
mpegvideo.c
diff --git
a/libavcodec/mpegvideo.c
b/libavcodec/mpegvideo.c
index
e5424cb
..
63a30b9
100644
(file)
--- 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
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;
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 !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
} 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)
}
void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h)