summaryrefslogtreecommitdiff
path: root/libavcodec/rv34.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-08-10 08:25:12 -0700
committerDiego Biurrun <diego@biurrun.de>2014-08-15 01:26:33 -0700
commit835f798c7d20bca89eb4f3593846251ad0d84e4b (patch)
tree98edb39b65856815da17bcdb0e937bd8b5ad3501 /libavcodec/rv34.c
parenta6a27fede94efe48aad1dcc9d5e000d2de71c7b2 (diff)
mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes
Diffstat (limited to 'libavcodec/rv34.c')
-rw-r--r--libavcodec/rv34.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 7411f6fa4b..75f321a430 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1475,7 +1475,7 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx)
MpegEncContext *s = &r->s;
int ret;
- ff_MPV_decode_defaults(s);
+ ff_mpv_decode_defaults(s);
s->avctx = avctx;
s->out_format = FMT_H263;
s->codec_id = avctx->codec_id;
@@ -1489,7 +1489,7 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx)
s->low_delay = 0;
ff_mpv_idct_init(s);
- if ((ret = ff_MPV_common_init(s)) < 0)
+ if ((ret = ff_mpv_common_init(s)) < 0)
return ret;
ff_h264_pred_init(&r->h, AV_CODEC_ID_RV40, 8, 1);
@@ -1504,7 +1504,7 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx)
#endif
if ((ret = rv34_decoder_alloc(r)) < 0) {
- ff_MPV_common_end(&r->s);
+ ff_mpv_common_end(&r->s);
return ret;
}
@@ -1526,10 +1526,10 @@ int ff_rv34_decode_init_thread_copy(AVCodecContext *avctx)
if (avctx->internal->is_copy) {
r->tmp_b_block_base = NULL;
ff_mpv_idct_init(&r->s);
- if ((err = ff_MPV_common_init(&r->s)) < 0)
+ if ((err = ff_mpv_common_init(&r->s)) < 0)
return err;
if ((err = rv34_decoder_alloc(r)) < 0) {
- ff_MPV_common_end(&r->s);
+ ff_mpv_common_end(&r->s);
return err;
}
}
@@ -1549,7 +1549,7 @@ int ff_rv34_decode_update_thread_context(AVCodecContext *dst, const AVCodecConte
if (s->height != s1->height || s->width != s1->width) {
s->height = s1->height;
s->width = s1->width;
- if ((err = ff_MPV_common_frame_size_change(s)) < 0)
+ if ((err = ff_mpv_common_frame_size_change(s)) < 0)
return err;
if ((err = rv34_decoder_realloc(r)) < 0)
return err;
@@ -1580,7 +1580,7 @@ static int finish_frame(AVCodecContext *avctx, AVFrame *pict)
int got_picture = 0, ret;
ff_er_frame_end(&s->er);
- ff_MPV_frame_end(s);
+ ff_mpv_frame_end(s);
s->mb_num_left = 0;
if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME))
@@ -1665,7 +1665,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "New frame but still %d MB left.",
s->mb_num_left);
ff_er_frame_end(&s->er);
- ff_MPV_frame_end(s);
+ ff_mpv_frame_end(s);
}
if (s->width != si.width || s->height != si.height) {
@@ -1681,13 +1681,13 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
if (err < 0)
return err;
- if ((err = ff_MPV_common_frame_size_change(s)) < 0)
+ if ((err = ff_mpv_common_frame_size_change(s)) < 0)
return err;
if ((err = rv34_decoder_realloc(r)) < 0)
return err;
}
s->pict_type = si.type ? si.type : AV_PICTURE_TYPE_I;
- if (ff_MPV_frame_start(s, s->avctx) < 0)
+ if (ff_mpv_frame_start(s, s->avctx) < 0)
return -1;
ff_mpeg_er_frame_start(s);
if (!r->tmp_b_block_base) {
@@ -1792,7 +1792,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
/* always mark the current frame as finished, frame-mt supports
* only complete frames */
ff_er_frame_end(&s->er);
- ff_MPV_frame_end(s);
+ ff_mpv_frame_end(s);
s->mb_num_left = 0;
ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 0);
return AVERROR_INVALIDDATA;
@@ -1806,7 +1806,7 @@ av_cold int ff_rv34_decode_end(AVCodecContext *avctx)
{
RV34DecContext *r = avctx->priv_data;
- ff_MPV_common_end(&r->s);
+ ff_mpv_common_end(&r->s);
rv34_decoder_free(r);
return 0;