diff options
| -rw-r--r-- | libavcodec/ituh263dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 6 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 4 | ||||
| -rw-r--r-- | libavcodec/rv10.c | 2 | ||||
| -rw-r--r-- | libavcodec/rv10enc.c | 2 | ||||
| -rw-r--r-- | libavcodec/rv20enc.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 6e6e013314..20c2d7c23f 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -465,7 +465,7 @@ static int h263_decode_block(MpegEncContext * s, DCTELEM * block, component = (n <= 3 ? 0 : n - 4 + 1); level = s->last_dc[component]; if (s->rv10_first_dc_coded[component]) { - diff = rv_decode_dc(s, n); + diff = ff_rv_decode_dc(s, n); if (diff == 0xffff) return -1; level += diff; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 864762d2eb..26213f1de1 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -813,9 +813,9 @@ int ff_h261_get_picture_format(int width, int height); /* rv10.c */ -void rv10_encode_picture_header(MpegEncContext *s, int picture_number); -int rv_decode_dc(MpegEncContext *s, int n); -void rv20_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number); +int ff_rv_decode_dc(MpegEncContext *s, int n); +void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number); /* msmpeg4.c */ diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 45dc2d07a7..a674d6315a 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3194,9 +3194,9 @@ static int encode_picture(MpegEncContext *s, int picture_number) else if (CONFIG_MPEG4_ENCODER && s->h263_pred) ff_mpeg4_encode_picture_header(s, picture_number); else if (CONFIG_RV10_ENCODER && s->codec_id == CODEC_ID_RV10) - rv10_encode_picture_header(s, picture_number); + ff_rv10_encode_picture_header(s, picture_number); else if (CONFIG_RV20_ENCODER && s->codec_id == CODEC_ID_RV20) - rv20_encode_picture_header(s, picture_number); + ff_rv20_encode_picture_header(s, picture_number); else if (CONFIG_FLV_ENCODER && s->codec_id == CODEC_ID_FLV1) ff_flv_encode_picture_header(s, picture_number); else if (CONFIG_H263_ENCODER) diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index e2dc8e1712..a282ba7724 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -186,7 +186,7 @@ static const uint8_t rv_chrom_bits[256] = static VLC rv_dc_lum, rv_dc_chrom; -int rv_decode_dc(MpegEncContext *s, int n) +int ff_rv_decode_dc(MpegEncContext *s, int n) { int code; diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c index e96e473c20..b8d5bdfd46 100644 --- a/libavcodec/rv10enc.c +++ b/libavcodec/rv10enc.c @@ -28,7 +28,7 @@ #include "mpegvideo.h" #include "put_bits.h" -void rv10_encode_picture_header(MpegEncContext *s, int picture_number) +void ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number) { int full_frame= 0; diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c index bf09d8ada4..78ebb46c2a 100644 --- a/libavcodec/rv20enc.c +++ b/libavcodec/rv20enc.c @@ -29,7 +29,7 @@ #include "h263.h" #include "put_bits.h" -void rv20_encode_picture_header(MpegEncContext *s, int picture_number){ +void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number){ put_bits(&s->pb, 2, s->pict_type); //I 0 vs. 1 ? put_bits(&s->pb, 1, 0); /* unknown bit */ put_bits(&s->pb, 5, s->qscale); |