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 /libavformat | |
| 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 'libavformat')
| -rw-r--r-- | libavformat/matroskaenc.c | 2 | ||||
| -rw-r--r-- | libavformat/oggenc.c | 2 | ||||
| -rw-r--r-- | libavformat/sdp.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a35a2fa09a..1adb479dd8 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -423,7 +423,7 @@ static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecContex else 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) { av_log(s, AV_LOG_ERROR, "Extradata corrupt.\n"); return -1; diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index d554b07c5b..7549b3a0a3 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -377,7 +377,7 @@ static int ogg_write_header(AVFormatContext *s) int header_type = st->codec->codec_id == CODEC_ID_VORBIS ? 3 : 0x81; 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, oggstream->header, oggstream->header_len) < 0) { av_log(s, AV_LOG_ERROR, "Extradata corrupted\n"); diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 5adf14dfd1..ba3d4dd611 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -252,7 +252,7 @@ static char *xiph_extradata2config(AVCodecContext *c) 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, header_len) < 0) { av_log(c, AV_LOG_ERROR, "Extradata corrupt.\n"); |