summaryrefslogtreecommitdiff
path: root/libavcodec/xiph.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-21 01:27:28 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-21 02:01:26 +0200
commitdd8ffc1925156720fa0acfc9242c358cee8031e9 (patch)
tree7f2908a4cce60e352e43c5cb27a77d870890ab10 /libavcodec/xiph.c
parent44a2bb75a72672177c3837512a2e1ea6f1143d66 (diff)
parent65d3176aaf8f876e0769f200abe95cac42151c89 (diff)
downloadffmpeg-dd8ffc1925156720fa0acfc9242c358cee8031e9.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: (47 commits) lavc: hide private symbols. lavc: deprecate img_get_alpha_info(). lavc: use avpriv_ prefix for ff_toupper4. lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits. lavc: use avpriv_ prefix for ff_ac3_parse_header. lavc: use avpriv_ prefix for ff_frame_rate_tab. lavc: rename ff_find_start_code to avpriv_mpv_find_start_code lavc: use avpriv_ prefix for ff_split_xiph_headers. lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header. lavc: use avpriv_ prefix for some dv symbols used in lavf. lavc: use avpriv_ prefix for some flac symbols used in lavf. lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf. lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf. lavc: use avpriv_ prefix for ff_aac_parse_header(). lavf: hide private symbols. lavf: use avpriv_ prefix for some dv functions. lavf: use avpriv_ prefix for ff_new_chapter(). avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2() avcodec: clarify documentation of CODEC_CAP_DELAY ... Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dv.c libavcodec/dvdata.c libavcodec/dvdata.h libavcodec/libspeexenc.c libavcodec/mpegvideo.c libavcodec/version.h libavformat/avidec.c libavformat/dv.c libavformat/dv.h libavformat/flvenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/oggparsespeex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xiph.c')
-rw-r--r--libavcodec/xiph.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/xiph.c b/libavcodec/xiph.c
index 2f4f25c929..0636f8ef59 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])
{