diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-24 12:45:07 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-24 12:45:07 +0100 |
commit | 932d8d790ccf4e8ce67b97057e5aaf738bbfc65a (patch) | |
tree | 84857db0f1a924e3b1ebf664122c203cffb94508 /libavcodec/h264_cabac.c | |
parent | 010adacbe2363a5f98d62db8fae7b0009552b801 (diff) | |
parent | 277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2 (diff) |
Merge commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2'
* commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2':
lavu: move internal define to the only places where it is used
Conflicts:
libavcodec/h264_cabac.c
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_cabac.c')
-rw-r--r-- | libavcodec/h264_cabac.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index c2e183d76b..6455ee7b2d 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -27,6 +27,7 @@ #define CABAC(h) 1 #define UNCHECKED_BITSTREAM_READER 1 +#define INT_BIT (CHAR_BIT * sizeof(int)) #include "libavutil/attributes.h" #include "libavutil/avassert.h" |