diff options
| author | Martin Storsjö <martin@martin.st> | 2012-02-15 12:38:52 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-02-15 22:06:56 +0200 |
| commit | d6c8dcb8ac0b844f24a07168022dead5e5ff9b91 (patch) | |
| tree | f6f1cf6ef7afa73842ce4847c11b76d1d759a9ea /libavcodec | |
| parent | 6f13a371ec14571a095d6e74d5bc24185dfd197e (diff) | |
| download | ffmpeg-d6c8dcb8ac0b844f24a07168022dead5e5ff9b91.tar.gz | |
mpeg12: Add ff_ prefix to nonstatic symbols
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg12enc.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 8 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 7ac8ce0e79..90da1ee34c 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -331,7 +331,7 @@ void ff_mpeg1_encode_slice_header(MpegEncContext *s){ put_bits(&s->pb, 1, 0); /* slice extra information */ } -void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number) +void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number) { mpeg1_encode_sequence_header(s); @@ -656,7 +656,7 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s, } } -void mpeg1_encode_mb(MpegEncContext *s, DCTELEM block[6][64], int motion_x, int motion_y) +void ff_mpeg1_encode_mb(MpegEncContext *s, DCTELEM block[6][64], int motion_x, int motion_y) { if (s->chroma_format == CHROMA_420) mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 6); else mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 8); diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 3d3b237898..3f312a0fe7 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -788,10 +788,10 @@ int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, extern const uint8_t ff_mpeg1_dc_scale_table[128]; extern const uint8_t * const ff_mpeg2_dc_scale_table[4]; -void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number); -void mpeg1_encode_mb(MpegEncContext *s, - DCTELEM block[6][64], - int motion_x, int motion_y); +void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_mpeg1_encode_mb(MpegEncContext *s, + DCTELEM block[6][64], + int motion_x, int motion_y); void ff_mpeg1_encode_init(MpegEncContext *s); void ff_mpeg1_encode_slice_header(MpegEncContext *s); void ff_mpeg1_clean_buffers(MpegEncContext *s); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 36e136ac9e..3a71d7b128 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1994,7 +1994,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, case CODEC_ID_MPEG1VIDEO: case CODEC_ID_MPEG2VIDEO: if (CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER) - mpeg1_encode_mb(s, s->block, motion_x, motion_y); + ff_mpeg1_encode_mb(s, s->block, motion_x, motion_y); break; case CODEC_ID_MPEG4: if (CONFIG_MPEG4_ENCODER) @@ -3204,7 +3204,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) break; case FMT_MPEG1: if (CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER) - mpeg1_encode_picture_header(s, picture_number); + ff_mpeg1_encode_picture_header(s, picture_number); break; case FMT_H264: break; |