diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 15:58:00 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 15:58:00 +0400 |
commit | 92656787cfeaf28af368bd4c20ffbaedc8ad3ca9 (patch) | |
tree | e02cc36e4c072e410ff7252b5599f56f186623ed /libavcodec/h264_cavlc.c | |
parent | bf4d0f8328c8f64611ca44a6ffdc30ca4f028249 (diff) | |
parent | 6d2b6f21eb45ffbda1103c772060303648714832 (diff) |
Merge commit '6d2b6f21eb45ffbda1103c772060303648714832'
* commit '6d2b6f21eb45ffbda1103c772060303648714832':
h264: add a parameter to the CABAC macro.
h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_cavlc.c')
-rw-r--r-- | libavcodec/h264_cavlc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index d1dcb2ca51..63f8d7826f 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -25,7 +25,7 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#define CABAC 0 +#define CABAC(h) 0 #define UNCHECKED_BITSTREAM_READER 1 #include "internal.h" |