Module: libav Branch: master Commit: 5c31eaa9998b2185e0aa04d11adff128498dc14a
Author: Alexandra Hájková <[email protected]> Committer: Diego Biurrun <[email protected]> Date: Sat Apr 23 16:44:11 2016 +0200 Remove unnecessary get_bits.h #includes and add missing headers where needed. Signed-off-by: Diego Biurrun <[email protected]> --- libavcodec/adpcmenc.c | 1 - libavcodec/cabac.c | 2 +- libavcodec/ffv1enc.c | 2 +- libavcodec/huffman.c | 1 - libavcodec/iff.c | 2 +- libavcodec/yop.c | 6 ++++-- libavformat/mpc.c | 2 +- libavformat/oggparseogm.c | 4 +++- libavformat/oggparsespeex.c | 4 +++- libavformat/oggparsevorbis.c | 3 ++- libavformat/tta.c | 5 +++-- 11 files changed, 19 insertions(+), 13 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 65e1f8e..3e17dbd 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -23,7 +23,6 @@ */ #include "avcodec.h" -#include "get_bits.h" #include "put_bits.h" #include "bytestream.h" #include "adpcm.h" diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c index a96c9f5..5c59003 100644 --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@ -27,7 +27,7 @@ #include <string.h> #include "libavutil/common.h" -#include "get_bits.h" + #include "cabac.h" #include "cabac_functions.h" diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 9c2e463..7995376 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -31,9 +31,9 @@ #include "libavutil/crc.h" #include "libavutil/opt.h" #include "libavutil/imgutils.h" + #include "avcodec.h" #include "internal.h" -#include "get_bits.h" #include "put_bits.h" #include "rangecoder.h" #include "golomb.h" diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c index f13ab296..2a3db87 100644 --- a/libavcodec/huffman.c +++ b/libavcodec/huffman.c @@ -27,7 +27,6 @@ #include <stdint.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 0d56cd5..a186e31 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -28,9 +28,9 @@ #include <stdint.h> #include "libavutil/imgutils.h" + #include "bytestream.h" #include "avcodec.h" -#include "get_bits.h" #include "internal.h" typedef struct IffContext { diff --git a/libavcodec/yop.c b/libavcodec/yop.c index 98ed723..5de4ac8 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 { diff --git a/libavformat/mpc.c b/libavformat/mpc.c index 8127996..cf8fe1e 100644 --- a/libavformat/mpc.c +++ b/libavformat/mpc.c @@ -20,7 +20,7 @@ */ #include "libavutil/channel_layout.h" -#include "libavcodec/get_bits.h" + #include "avformat.h" #include "internal.h" #include "apetag.h" diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index 3ce11bd..6278465 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -23,9 +23,11 @@ **/ #include <stdlib.h> + #include "libavutil/intreadwrite.h" -#include "libavcodec/get_bits.h" + #include "libavcodec/bytestream.h" + #include "avformat.h" #include "internal.h" #include "oggdec.h" diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c index fa24c12..2430cd7 100644 --- a/libavformat/oggparsespeex.c +++ b/libavformat/oggparsespeex.c @@ -23,11 +23,13 @@ **/ #include <stdlib.h> + #include "libavutil/bswap.h" #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" -#include "libavcodec/get_bits.h" + #include "libavcodec/bytestream.h" + #include "avformat.h" #include "internal.h" #include "oggdec.h" diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 4cb10a1..95fe082 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -28,9 +28,10 @@ #include "libavutil/base64.h" #include "libavutil/bswap.h" #include "libavutil/dict.h" + #include "libavcodec/bytestream.h" -#include "libavcodec/get_bits.h" #include "libavcodec/vorbis_parser.h" + #include "avformat.h" #include "flac_picture.h" #include "internal.h" diff --git a/libavformat/tta.c b/libavformat/tta.c index be22527..091b502 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -19,11 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/get_bits.h" +#include "libavutil/dict.h" +#include "libavutil/intreadwrite.h" + #include "avformat.h" #include "internal.h" #include "id3v1.h" -#include "libavutil/dict.h" typedef struct TTAContext { int totalframes, currentframe; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
