diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-28 13:36:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-28 13:54:40 +0200 |
| commit | 2acb5cd90793de7f375bf6ebf4eabe2b59a2ecc3 (patch) | |
| tree | 5d827d355bab646ca6ccdebe930ac927a02c3713 /libavcodec/get_bits.h | |
| parent | 4fefe91a33956007f17cfd6e0c5ee1cb3a3f36d8 (diff) | |
| parent | d16860a237ae56a21d051df6556c40de9be53faa (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libopus: Remap channels using libopus' internal remapping.
Opus decoder using libopus
avcodec: document the use of AVCodecContext.delay for audio decoding
vc1dec: add flush function for WMV9 and VC-1 decoders
http: Increase buffer sizes to cope with longer URIs
nutenc: const correctness for ff_put_v_trace/put_s_trace function arguments
h264_refs: Fix debug tprintf argument types
golomb: const correctness for get_ue()/get_se() function arguments
get_bits: const correctness for get_bits_trace()/get_xbits_trace() arguments
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/get_bits.h')
| -rw-r--r-- | libavcodec/get_bits.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 2123972fb0..d926f57575 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -521,7 +521,7 @@ static inline void print_bin(int bits, int n) av_log(NULL, AV_LOG_DEBUG, " "); } -static inline int get_bits_trace(GetBitContext *s, int n, char *file, +static inline int get_bits_trace(GetBitContext *s, int n, const char *file, const char *func, int line) { int r = get_bits(s, n); @@ -532,7 +532,7 @@ static inline int get_bits_trace(GetBitContext *s, int n, char *file, return r; } static inline int get_vlc_trace(GetBitContext *s, VLC_TYPE (*table)[2], - int bits, int max_depth, char *file, + int bits, int max_depth, const char *file, const char *func, int line) { int show = show_bits(s, 24); @@ -547,7 +547,7 @@ static inline int get_vlc_trace(GetBitContext *s, VLC_TYPE (*table)[2], bits2, len, r, pos, file, func, line); return r; } -static inline int get_xbits_trace(GetBitContext *s, int n, char *file, +static inline int get_xbits_trace(GetBitContext *s, int n, const char *file, const char *func, int line) { int show = show_bits(s, n); |