diff options
author | Alexandra Hájková <alexandra@khirnov.net> | 2016-04-23 16:44:11 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2016-05-04 15:14:14 +0200 |
commit | 5c31eaa9998b2185e0aa04d11adff128498dc14a (patch) | |
tree | 385171fd523ac163ce4ea4db7a360803fac37dbb /libavformat | |
parent | c11c693accaad65d3f4afa44c27f2338a2e3bf8f (diff) | |
download | ffmpeg-5c31eaa9998b2185e0aa04d11adff128498dc14a.tar.gz |
Remove unnecessary get_bits.h #includes and add missing headers where needed.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/mpc.c | 2 | ||||
-rw-r--r-- | libavformat/oggparseogm.c | 4 | ||||
-rw-r--r-- | libavformat/oggparsespeex.c | 4 | ||||
-rw-r--r-- | libavformat/oggparsevorbis.c | 3 | ||||
-rw-r--r-- | libavformat/tta.c | 5 |
5 files changed, 12 insertions, 6 deletions
diff --git a/libavformat/mpc.c b/libavformat/mpc.c index 8127996e01..cf8fe1e136 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 3ce11bdaff..62784650b6 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 fa24c127dc..2430cd742b 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 4cb10a1070..95fe082949 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 be22527eab..091b502567 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; |