diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 15:42:49 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 15:42:49 +0200 |
| commit | 9204a84998083abbe058bf1464317f7ef8016c6c (patch) | |
| tree | 421ad218c69cffa85f5a5ea5536d3dea1c07b1d6 /libavcodec | |
| parent | 3801060cd028cc11cd4000eae8e578a715051310 (diff) | |
| parent | 5c31eaa9998b2185e0aa04d11adff128498dc14a (diff) | |
| download | ffmpeg-9204a84998083abbe058bf1464317f7ef8016c6c.tar.gz | |
Merge commit '5c31eaa9998b2185e0aa04d11adff128498dc14a'
* commit '5c31eaa9998b2185e0aa04d11adff128498dc14a':
Remove unnecessary get_bits.h #includes and add missing headers where needed.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/cabac.c | 2 | ||||
| -rw-r--r-- | libavcodec/ffv1enc.c | 1 | ||||
| -rw-r--r-- | libavcodec/huffman.c | 1 | ||||
| -rw-r--r-- | libavcodec/iff.c | 1 | ||||
| -rw-r--r-- | libavcodec/yop.c | 6 |
5 files changed, 7 insertions, 4 deletions
diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c index a718d51ddb..c0abe834cf 100644 --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@ -28,7 +28,7 @@ #include "libavutil/common.h" #include "libavutil/timer.h" -#include "get_bits.h" + #include "cabac.h" #include "cabac_functions.h" diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index f2434e61aa..948a230419 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -32,6 +32,7 @@ #include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" #include "libavutil/timer.h" + #include "avcodec.h" #include "internal.h" #include "put_bits.h" diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c index d7403b88a3..1f5d8b9c05 100644 --- a/libavcodec/huffman.c +++ b/libavcodec/huffman.c @@ -28,7 +28,6 @@ #include "libavutil/qsort.h" #include "avcodec.h" -#include "get_bits.h" #include "huffman.h" /* symbol for Huffman tree node */ diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 7f3414bde9..ef9ce9112f 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -29,6 +29,7 @@ #include <stdint.h> #include "libavutil/imgutils.h" + #include "bytestream.h" #include "avcodec.h" #include "internal.h" diff --git a/libavcodec/yop.c b/libavcodec/yop.c index c6b19ec795..32cfea200a 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -22,11 +22,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/intreadwrite.h" +#include <string.h> + #include "libavutil/imgutils.h" +#include "libavutil/internal.h" +#include "libavutil/intreadwrite.h" #include "avcodec.h" -#include "get_bits.h" #include "internal.h" typedef struct YopDecContext { |