From 835f798c7d20bca89eb4f3593846251ad0d84e4b Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 10 Aug 2014 08:25:12 -0700 Subject: mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes --- libavcodec/mpeg12dec.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'libavcodec/mpeg12dec.c') diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 29f8980913..5a875c2518 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1098,7 +1098,7 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) Mpeg1Context *s = avctx->priv_data; MpegEncContext *s2 = &s->mpeg_enc_ctx; - ff_MPV_decode_defaults(s2); + ff_mpv_decode_defaults(s2); s->mpeg_enc_ctx.avctx = avctx; s->mpeg_enc_ctx.flags = avctx->flags; @@ -1221,7 +1221,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) if (s1->mpeg_enc_ctx_allocated) { ParseContext pc = s->parse_context; s->parse_context.buffer = 0; - ff_MPV_common_end(s); + ff_mpv_common_end(s); s->parse_context = pc; } @@ -1312,7 +1312,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) memcpy(old_permutation, s->idsp.idct_permutation, 64 * sizeof(uint8_t)); ff_mpv_idct_init(s); - if (ff_MPV_common_init(s) < 0) + if (ff_mpv_common_init(s) < 0) return -2; quant_matrix_rebuild(s->intra_matrix, old_permutation, s->idsp.idct_permutation); @@ -1590,7 +1590,7 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) if (s->first_field || s->picture_structure == PICT_FRAME) { AVFrameSideData *pan_scan; - if (ff_MPV_frame_start(s, avctx) < 0) + if (ff_mpv_frame_start(s, avctx) < 0) return -1; ff_mpeg_er_frame_start(s); @@ -1676,7 +1676,7 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) #if FF_API_XVMC FF_DISABLE_DEPRECATION_WARNINGS -// MPV_frame_start will call this function too, +// ff_mpv_frame_start will call this function too, // but we need to call it on every field if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) if (ff_xvmc_field_start(s, avctx) < 0) @@ -1841,13 +1841,13 @@ FF_ENABLE_DEPRECATION_WARNINGS s->dest[1] += 16 >> s->chroma_x_shift; s->dest[2] += 16 >> s->chroma_x_shift; - ff_MPV_decode_mb(s, s->block); + ff_mpv_decode_mb(s, s->block); if (++s->mb_x >= s->mb_width) { const int mb_size = 16; ff_mpeg_draw_horiz_band(s, mb_size * (s->mb_y >> field_pic), mb_size); - ff_MPV_report_decode_progress(s); + ff_mpv_report_decode_progress(s); s->mb_x = 0; s->mb_y += 1 << field_pic; @@ -2016,7 +2016,7 @@ FF_ENABLE_DEPRECATION_WARNINGS ff_er_frame_end(&s->er); - ff_MPV_frame_end(s); + ff_mpv_frame_end(s); if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) { int ret = av_frame_ref(pict, s->current_picture_ptr->f); @@ -2133,7 +2133,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx) /* start new MPEG-1 context decoding */ s->out_format = FMT_MPEG1; if (s1->mpeg_enc_ctx_allocated) { - ff_MPV_common_end(s); + ff_mpv_common_end(s); } s->width = avctx->coded_width; s->height = avctx->coded_height; @@ -2151,7 +2151,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx) avctx->idct_algo = FF_IDCT_SIMPLE; ff_mpv_idct_init(s); - if (ff_MPV_common_init(s) < 0) + if (ff_mpv_common_init(s) < 0) return -1; s1->mpeg_enc_ctx_allocated = 1; @@ -2653,7 +2653,7 @@ static av_cold int mpeg_decode_end(AVCodecContext *avctx) Mpeg1Context *s = avctx->priv_data; if (s->mpeg_enc_ctx_allocated) - ff_MPV_common_end(&s->mpeg_enc_ctx); + ff_mpv_common_end(&s->mpeg_enc_ctx); av_freep(&s->a53_caption); return 0; } -- cgit v1.2.3