diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-10 14:05:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-10 14:06:20 +0200 |
| commit | bff2afb3e978c9cdffdd03a2571e4f6ddab74731 (patch) | |
| tree | 7a92225c964848221a8be28232d1f6137475eb66 /libavcodec/put_bits.h | |
| parent | e4fe4d01fc31bfdabf6f9b106c633139287a400d (diff) | |
| parent | a84edbacaf5adbe6e3672851aa8b3034b95787e2 (diff) | |
| download | ffmpeg-bff2afb3e978c9cdffdd03a2571e4f6ddab74731.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Only compile motion_est code when encoders are enabled
mem: fix typo in check for __ICC
fate: mp3: drop redundant CMP setting
rtp: Depacketization of JPEG (RFC 2435)
Rename ff_put_string to avpriv_put_string
mjpeg: Rename some symbols to avpriv_* instead of ff_*
yadif: cosmetics
Conflicts:
Changelog
libavcodec/mjpegenc.c
libavcodec/x86/Makefile
libavfilter/vf_yadif.c
libavformat/version.h
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/put_bits.h')
| -rw-r--r-- | libavcodec/put_bits.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index 5ece495075..e83f72194e 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -99,7 +99,7 @@ static inline void flush_put_bits(PutBitContext *s) #ifdef BITSTREAM_WRITER_LE #define avpriv_align_put_bits align_put_bits_unsupported_here -#define ff_put_string ff_put_string_unsupported_here +#define avpriv_put_string ff_put_string_unsupported_here #define avpriv_copy_bits avpriv_copy_bits_unsupported_here #else /** @@ -112,7 +112,7 @@ void avpriv_align_put_bits(PutBitContext *s); * * @param terminate_string 0-terminates the written string if value is 1 */ -void ff_put_string(PutBitContext *pb, const char *string, int terminate_string); +void avpriv_put_string(PutBitContext *pb, const char *string, int terminate_string); /** * Copy the content of src to the bitstream. |