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/bitstream.c | |
| parent | e4fe4d01fc31bfdabf6f9b106c633139287a400d (diff) | |
| parent | a84edbacaf5adbe6e3672851aa8b3034b95787e2 (diff) | |
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/bitstream.c')
| -rw-r--r-- | libavcodec/bitstream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 0d3f59792c..ce20f5685e 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -47,7 +47,7 @@ void avpriv_align_put_bits(PutBitContext *s) put_bits(s,s->bit_left & 7,0); } -void ff_put_string(PutBitContext *pb, const char *string, int terminate_string) +void avpriv_put_string(PutBitContext *pb, const char *string, int terminate_string) { while(*string){ put_bits(pb, 8, *string); |