aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2016-06-21 15:42:49 +0200
committerClément Bœsch <clement@stupeflix.com>2016-06-21 15:42:49 +0200
commit9204a84998083abbe058bf1464317f7ef8016c6c (patch)
tree421ad218c69cffa85f5a5ea5536d3dea1c07b1d6
parent3801060cd028cc11cd4000eae8e578a715051310 (diff)
parent5c31eaa9998b2185e0aa04d11adff128498dc14a (diff)
downloadffmpeg-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>
-rw-r--r--libavcodec/cabac.c2
-rw-r--r--libavcodec/ffv1enc.c1
-rw-r--r--libavcodec/huffman.c1
-rw-r--r--libavcodec/iff.c1
-rw-r--r--libavcodec/yop.c6
-rw-r--r--libavformat/mpc.c2
-rw-r--r--libavformat/oggparseogm.c4
-rw-r--r--libavformat/oggparsespeex.c4
-rw-r--r--libavformat/oggparsevorbis.c3
-rw-r--r--libavformat/tta.c7
10 files changed, 20 insertions, 11 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 {
diff --git a/libavformat/mpc.c b/libavformat/mpc.c
index f32d65fa55..4bd1f5018b 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 65c2d5f274..f8e656dcb1 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -23,10 +23,12 @@
**/
#include <stdlib.h>
+
#include "libavutil/avassert.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 d7b153aa15..434b0fdab1 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 89f40f6379..65b1998a02 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 ba1a385834..02656acffd 100644
--- a/libavformat/tta.c
+++ b/libavformat/tta.c
@@ -19,14 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavcodec/get_bits.h"
+#include "libavutil/crc.h"
+#include "libavutil/dict.h"
+#include "libavutil/intreadwrite.h"
+
#include "apetag.h"
#include "avformat.h"
#include "avio_internal.h"
#include "internal.h"
#include "id3v1.h"
-#include "libavutil/crc.h"
-#include "libavutil/dict.h"
typedef struct TTAContext {
int totalframes, currentframe;