diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-10-17 09:45:27 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-20 21:06:58 +0200 |
| commit | 357db4c263bb7edfd9790414f0f378e752f924e9 (patch) | |
| tree | 511390ac7ac03b801c72fbd507cd7b1e897c9883 /libavcodec | |
| parent | 2361e59b98f1c78d9720e72aabfb847dd9906f12 (diff) | |
| download | ffmpeg-357db4c263bb7edfd9790414f0f378e752f924e9.tar.gz | |
lavc: use avpriv_ prefix for ff_split_xiph_headers.
It's used in lavf.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vorbisdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/vp3.c | 2 | ||||
| -rw-r--r-- | libavcodec/xiph.c | 2 | ||||
| -rw-r--r-- | libavcodec/xiph.h | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 7c07de646a..2662a6cf15 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -987,7 +987,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) return -1; } - if (ff_split_xiph_headers(headers, headers_len, 30, header_start, header_len) < 0) { + if (avpriv_split_xiph_headers(headers, headers_len, 30, header_start, header_len) < 0) { av_log(avccontext, AV_LOG_ERROR, "Extradata corrupt.\n"); return -1; } diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 9262c27f05..36715bb0c7 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2275,7 +2275,7 @@ static av_cold int theora_decode_init(AVCodecContext *avctx) return -1; } - if (ff_split_xiph_headers(avctx->extradata, avctx->extradata_size, + if (avpriv_split_xiph_headers(avctx->extradata, avctx->extradata_size, 42, header_start, header_len) < 0) { av_log(avctx, AV_LOG_ERROR, "Corrupt extradata\n"); return -1; diff --git a/libavcodec/xiph.c b/libavcodec/xiph.c index 0bcfd45eea..7c3c7100c6 100644 --- a/libavcodec/xiph.c +++ b/libavcodec/xiph.c @@ -21,7 +21,7 @@ #include "libavutil/intreadwrite.h" #include "xiph.h" -int ff_split_xiph_headers(uint8_t *extradata, int extradata_size, +int avpriv_split_xiph_headers(uint8_t *extradata, int extradata_size, int first_header_size, uint8_t *header_start[3], int header_len[3]) { diff --git a/libavcodec/xiph.h b/libavcodec/xiph.h index da18c9c094..afaece7cee 100644 --- a/libavcodec/xiph.h +++ b/libavcodec/xiph.h @@ -36,8 +36,8 @@ * @param[out] header_len The sizes of each of the three headers. * @return On error a negative value is returned, on success zero. */ -int ff_split_xiph_headers(uint8_t *extradata, int extradata_size, - int first_header_size, uint8_t *header_start[3], - int header_len[3]); +int avpriv_split_xiph_headers(uint8_t *extradata, int extradata_size, + int first_header_size, uint8_t *header_start[3], + int header_len[3]); #endif /* AVCODEC_XIPH_H */ |