| @@ -987,7 +987,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) | |||||
| return -1; | 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"); | av_log(avccontext, AV_LOG_ERROR, "Extradata corrupt.\n"); | ||||
| return -1; | return -1; | ||||
| } | } | ||||
| @@ -2275,7 +2275,7 @@ static av_cold int theora_decode_init(AVCodecContext *avctx) | |||||
| return -1; | 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) { | 42, header_start, header_len) < 0) { | ||||
| av_log(avctx, AV_LOG_ERROR, "Corrupt extradata\n"); | av_log(avctx, AV_LOG_ERROR, "Corrupt extradata\n"); | ||||
| return -1; | return -1; | ||||
| @@ -21,7 +21,7 @@ | |||||
| #include "libavutil/intreadwrite.h" | #include "libavutil/intreadwrite.h" | ||||
| #include "xiph.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 first_header_size, uint8_t *header_start[3], | ||||
| int header_len[3]) | int header_len[3]) | ||||
| { | { | ||||
| @@ -36,8 +36,8 @@ | |||||
| * @param[out] header_len The sizes of each of the three headers. | * @param[out] header_len The sizes of each of the three headers. | ||||
| * @return On error a negative value is returned, on success zero. | * @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 */ | #endif /* AVCODEC_XIPH_H */ | ||||
| @@ -423,7 +423,7 @@ static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecContex | |||||
| else | else | ||||
| first_header_size = 42; | first_header_size = 42; | ||||
| if (ff_split_xiph_headers(codec->extradata, codec->extradata_size, | |||||
| if (avpriv_split_xiph_headers(codec->extradata, codec->extradata_size, | |||||
| first_header_size, header_start, header_len) < 0) { | first_header_size, header_start, header_len) < 0) { | ||||
| av_log(s, AV_LOG_ERROR, "Extradata corrupt.\n"); | av_log(s, AV_LOG_ERROR, "Extradata corrupt.\n"); | ||||
| return -1; | return -1; | ||||
| @@ -377,7 +377,7 @@ static int ogg_write_header(AVFormatContext *s) | |||||
| int header_type = st->codec->codec_id == CODEC_ID_VORBIS ? 3 : 0x81; | int header_type = st->codec->codec_id == CODEC_ID_VORBIS ? 3 : 0x81; | ||||
| int framing_bit = st->codec->codec_id == CODEC_ID_VORBIS ? 1 : 0; | int framing_bit = st->codec->codec_id == CODEC_ID_VORBIS ? 1 : 0; | ||||
| if (ff_split_xiph_headers(st->codec->extradata, st->codec->extradata_size, | |||||
| if (avpriv_split_xiph_headers(st->codec->extradata, st->codec->extradata_size, | |||||
| st->codec->codec_id == CODEC_ID_VORBIS ? 30 : 42, | st->codec->codec_id == CODEC_ID_VORBIS ? 30 : 42, | ||||
| oggstream->header, oggstream->header_len) < 0) { | oggstream->header, oggstream->header_len) < 0) { | ||||
| av_log(s, AV_LOG_ERROR, "Extradata corrupted\n"); | av_log(s, AV_LOG_ERROR, "Extradata corrupted\n"); | ||||
| @@ -252,7 +252,7 @@ static char *xiph_extradata2config(AVCodecContext *c) | |||||
| return NULL; | return NULL; | ||||
| } | } | ||||
| if (ff_split_xiph_headers(c->extradata, c->extradata_size, | |||||
| if (avpriv_split_xiph_headers(c->extradata, c->extradata_size, | |||||
| first_header_size, header_start, | first_header_size, header_start, | ||||
| header_len) < 0) { | header_len) < 0) { | ||||
| av_log(c, AV_LOG_ERROR, "Extradata corrupt.\n"); | av_log(c, AV_LOG_ERROR, "Extradata corrupt.\n"); | ||||