diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 14:12:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 15:09:58 +0100 |
| commit | efc4439c894be9f45ec472ad2471143f94abc399 (patch) | |
| tree | eb5aecf2581cbbf83f6d8cc8a4fa2054a83c0c82 /libavcodec/s302menc.c | |
| parent | 8cc581fbf77ac25deb9eb9398cf4c759857aaeaa (diff) | |
| parent | 973dc4e8d4ae0def273c33bac354ddc6d8e0c470 (diff) | |
| download | ffmpeg-efc4439c894be9f45ec472ad2471143f94abc399.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
put_bits: Remove unused includes
Conflicts:
libavcodec/put_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/s302menc.c')
| -rw-r--r-- | libavcodec/s302menc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/s302menc.c b/libavcodec/s302menc.c index a7e5b1d26b..540ac29dab 100644 --- a/libavcodec/s302menc.c +++ b/libavcodec/s302menc.c @@ -22,6 +22,7 @@ #include "avcodec.h" #include "internal.h" +#include "mathops.h" #include "put_bits.h" #define AES3_HEADER_LEN 4 |