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/put_bits.h | |
| 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/put_bits.h')
| -rw-r--r-- | libavcodec/put_bits.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index e2c4a61791..8081fb9ea5 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -27,16 +27,11 @@ #define AVCODEC_PUT_BITS_H #include <stdint.h> -#include <stdlib.h> +#include <stddef.h> #include <assert.h> -#include "libavutil/bswap.h" -#include "libavutil/common.h" #include "libavutil/intreadwrite.h" -#include "libavutil/log.h" #include "libavutil/avassert.h" -#include "mathops.h" -#include "config.h" typedef struct PutBitContext { uint32_t bit_buf; |