aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rv10.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-02-15 14:10:33 +0200
committerMartin Storsjö <martin@martin.st>2012-02-15 22:07:23 +0200
commitefd29844eb84ca5e1b05292300054ea12b02d1e5 (patch)
tree0d10e3ec6b1c73df4ed62f1bbd00546baf11df4c /libavcodec/rv10.c
parent0ca1bdb37d3597f67b8547c262aaa5b82d4e563e (diff)
downloadffmpeg-efd29844eb84ca5e1b05292300054ea12b02d1e5.tar.gz
mpegvideo: Add ff_ prefix to nonstatic functions
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/rv10.c')
-rw-r--r--libavcodec/rv10.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index a282ba7724..75d529f42d 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -351,11 +351,11 @@ static int rv20_decode_picture_header(MpegEncContext *s)
av_log(s->avctx, AV_LOG_DEBUG, "attempting to change resolution to %dx%d\n", new_w, new_h);
if (av_image_check_size(new_w, new_h, 0, s->avctx) < 0)
return -1;
- MPV_common_end(s);
+ ff_MPV_common_end(s);
avcodec_set_dimensions(s->avctx, new_w, new_h);
s->width = new_w;
s->height = new_h;
- if (MPV_common_init(s) < 0)
+ if (ff_MPV_common_init(s) < 0)
return -1;
}
@@ -427,7 +427,7 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
return -1;
}
- MPV_decode_defaults(s);
+ ff_MPV_decode_defaults(s);
s->avctx= avctx;
s->out_format = FMT_H263;
@@ -468,7 +468,7 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
avctx->pix_fmt = PIX_FMT_YUV420P;
- if (MPV_common_init(s) < 0)
+ if (ff_MPV_common_init(s) < 0)
return -1;
ff_h263_decode_init_vlc(s);
@@ -491,7 +491,7 @@ static av_cold int rv10_decode_end(AVCodecContext *avctx)
{
MpegEncContext *s = avctx->priv_data;
- MPV_common_end(s);
+ ff_MPV_common_end(s);
return 0;
}
@@ -526,10 +526,10 @@ static int rv10_decode_packet(AVCodecContext *avctx,
if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) {
if(s->current_picture_ptr){ //FIXME write parser so we always have complete frames?
ff_er_frame_end(s);
- MPV_frame_end(s);
+ ff_MPV_frame_end(s);
s->mb_x= s->mb_y = s->resync_mb_x = s->resync_mb_y= 0;
}
- if(MPV_frame_start(s, avctx) < 0)
+ if(ff_MPV_frame_start(s, avctx) < 0)
return -1;
ff_er_frame_start(s);
} else {
@@ -596,7 +596,7 @@ static int rv10_decode_packet(AVCodecContext *avctx,
}
if(s->pict_type != AV_PICTURE_TYPE_B)
ff_h263_update_motion_val(s);
- MPV_decode_mb(s, s->block);
+ ff_MPV_decode_mb(s, s->block);
if(s->loop_filter)
ff_h263_loop_filter(s);
@@ -674,7 +674,7 @@ static int rv10_decode_frame(AVCodecContext *avctx,
if(s->current_picture_ptr != NULL && s->mb_y>=s->mb_height){
ff_er_frame_end(s);
- MPV_frame_end(s);
+ ff_MPV_frame_end(s);
if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
*pict= *(AVFrame*)s->current_picture_ptr;