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 | |
| parent | 010adacbe2363a5f98d62db8fae7b0009552b801 (diff) | |
| parent | 277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2 (diff) | |
| download | ffmpeg-932d8d790ccf4e8ce67b97057e5aaf738bbfc65a.tar.gz | |
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>
| -rw-r--r-- | libavcodec/h263.h | 1 | ||||
| -rw-r--r-- | libavcodec/h264_cabac.c | 1 | ||||
| -rw-r--r-- | libavutil/internal.h | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/h263.h b/libavcodec/h263.h index 54ce2a5f97..29798ba655 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -29,6 +29,7 @@ #if !FF_API_ASPECT_EXTENDED #define FF_ASPECT_EXTENDED 15 #endif +#define INT_BIT (CHAR_BIT * sizeof(int)) // The defines below define the number of bits that are read at once for // reading vlc values. Changing these may improve speed and data cache needs 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" diff --git a/libavutil/internal.h b/libavutil/internal.h index 612b5f26af..77af6f9512 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -80,9 +80,6 @@ # define FF_ENABLE_DEPRECATION_WARNINGS #endif -#ifndef INT_BIT -# define INT_BIT (CHAR_BIT * sizeof(int)) -#endif #define FF_MEMORY_POISON 0x2a |