diff options
Diffstat (limited to 'contrib/ffmpeg/libavcodec/bitstream.h')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/bitstream.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/contrib/ffmpeg/libavcodec/bitstream.h b/contrib/ffmpeg/libavcodec/bitstream.h index af25b6dcf..18842702c 100644 --- a/contrib/ffmpeg/libavcodec/bitstream.h +++ b/contrib/ffmpeg/libavcodec/bitstream.h @@ -187,12 +187,12 @@ static inline uint##x##_t unaligned##x(const void *v) { \ } # elif defined(__DECC) # define unaligned(x) \ -static inline uint##x##_t unaligned##x##(const void *v) { \ +static inline uint##x##_t unaligned##x(const void *v) { \ return *(const __unaligned uint##x##_t *) v; \ } # else # define unaligned(x) \ -static inline uint##x##_t unaligned##x##(const void *v) { \ +static inline uint##x##_t unaligned##x(const void *v) { \ return *(const uint##x##_t *) v; \ } # endif @@ -662,7 +662,7 @@ static inline int get_sbits(GetBitContext *s, int n){ } /** - * reads 0-17 bits. + * reads 1-17 bits. * Note, the alt bitstream reader can read up to 25 bits, but the libmpeg2 reader can't */ static inline unsigned int get_bits(GetBitContext *s, int n){ @@ -676,7 +676,7 @@ static inline unsigned int get_bits(GetBitContext *s, int n){ } /** - * shows 0-17 bits. + * shows 1-17 bits. * Note, the alt bitstream reader can read up to 25 bits, but the libmpeg2 reader can't */ static inline unsigned int show_bits(GetBitContext *s, int n){ @@ -877,7 +877,7 @@ void free_vlc(VLC *vlc); * read the longest vlc code * = (max_vlc_length + bits - 1) / bits */ -static always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], +static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], int bits, int max_depth) { int code; @@ -938,10 +938,10 @@ static inline int get_xbits_trace(GetBitContext *s, int n, char *file, const cha #define get_vlc(s, vlc) get_vlc_trace(s, (vlc)->table, (vlc)->bits, 3, __FILE__, __PRETTY_FUNCTION__, __LINE__) #define get_vlc2(s, tab, bits, max) get_vlc_trace(s, tab, bits, max, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#define tprintf(...) av_log(NULL, AV_LOG_DEBUG, __VA_ARGS__) +#define tprintf(p, ...) av_log(p, AV_LOG_DEBUG, __VA_ARGS__) #else //TRACE -#define tprintf(...) {} +#define tprintf(p, ...) {} #endif static inline int decode012(GetBitContext *gb){ |