summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-04 14:12:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-04 15:09:58 +0100
commitefc4439c894be9f45ec472ad2471143f94abc399 (patch)
treeeb5aecf2581cbbf83f6d8cc8a4fa2054a83c0c82 /libavcodec
parent8cc581fbf77ac25deb9eb9398cf4c759857aaeaa (diff)
parent973dc4e8d4ae0def273c33bac354ddc6d8e0c470 (diff)
downloadffmpeg-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')
-rw-r--r--libavcodec/ac3enc.h4
-rw-r--r--libavcodec/dca.c4
-rw-r--r--libavcodec/dcaenc.c1
-rw-r--r--libavcodec/lzwenc.c3
-rw-r--r--libavcodec/mjpeg.h3
-rw-r--r--libavcodec/nellymoserenc.c6
-rw-r--r--libavcodec/put_bits.h7
-rw-r--r--libavcodec/ra144enc.c3
-rw-r--r--libavcodec/s302menc.c1
-rw-r--r--libavcodec/vorbisenc.c2
10 files changed, 21 insertions, 13 deletions
diff --git a/libavcodec/ac3enc.h b/libavcodec/ac3enc.h
index a04e704d97..94312ba46f 100644
--- a/libavcodec/ac3enc.h
+++ b/libavcodec/ac3enc.h
@@ -31,12 +31,14 @@
#include <stdint.h>
#include "libavutil/float_dsp.h"
+
#include "ac3.h"
#include "ac3dsp.h"
#include "avcodec.h"
#include "dsputil.h"
-#include "put_bits.h"
#include "fft.h"
+#include "mathops.h"
+#include "put_bits.h"
#ifndef CONFIG_AC3ENC_FLOAT
#define CONFIG_AC3ENC_FLOAT 0
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 1c1c080350..fcdfef2147 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -25,8 +25,10 @@
#include <stdint.h>
#include <string.h>
-#include "put_bits.h"
+#include "libavutil/error.h"
+
#include "dca.h"
+#include "put_bits.h"
const uint32_t avpriv_dca_sample_rates[16] =
{
diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c
index cb73f42a07..8d0655ddcf 100644
--- a/libavcodec/dcaenc.c
+++ b/libavcodec/dcaenc.c
@@ -29,6 +29,7 @@
#include "dcadata.h"
#include "dcaenc.h"
#include "internal.h"
+#include "mathops.h"
#include "put_bits.h"
#define MAX_CHANNELS 6
diff --git a/libavcodec/lzwenc.c b/libavcodec/lzwenc.c
index d5a07bc7ba..03080ee587 100644
--- a/libavcodec/lzwenc.c
+++ b/libavcodec/lzwenc.c
@@ -26,8 +26,9 @@
*/
#include "avcodec.h"
-#include "put_bits.h"
#include "lzw.h"
+#include "mathops.h"
+#include "put_bits.h"
#define LZW_MAXBITS 12
#define LZW_SIZTABLE (1<<LZW_MAXBITS)
diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h
index 96e18545a7..73db1dd1eb 100644
--- a/libavcodec/mjpeg.h
+++ b/libavcodec/mjpeg.h
@@ -33,10 +33,11 @@
#ifndef AVCODEC_MJPEG_H
#define AVCODEC_MJPEG_H
+#include "libavutil/internal.h"
+
#include "avcodec.h"
#include "put_bits.h"
-
/* JPEG marker codes */
typedef enum {
/* start of frame */
diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c
index f9d1389a78..98e33f0e2e 100644
--- a/libavcodec/nellymoserenc.c
+++ b/libavcodec/nellymoserenc.c
@@ -35,13 +35,15 @@
* http://wiki.multimedia.cx/index.php?title=Nellymoser
*/
+#include "libavutil/common.h"
#include "libavutil/float_dsp.h"
#include "libavutil/mathematics.h"
-#include "nellymoser.h"
-#include "avcodec.h"
+
#include "audio_frame_queue.h"
+#include "avcodec.h"
#include "fft.h"
#include "internal.h"
+#include "nellymoser.h"
#include "sinewin.h"
#define BITSTREAM_WRITER_LE
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;
diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c
index 0db6032615..d09e281e12 100644
--- a/libavcodec/ra144enc.c
+++ b/libavcodec/ra144enc.c
@@ -29,9 +29,10 @@
#include "avcodec.h"
#include "audio_frame_queue.h"
+#include "celp_filters.h"
#include "internal.h"
+#include "mathops.h"
#include "put_bits.h"
-#include "celp_filters.h"
#include "ra144.h"
diff --git a/libavcodec/s302menc.c b/libavcodec/s302menc.c
index a7e5b1d26b..540ac29dab 100644
--- a/libavcodec/s302menc.c
+++ b/libavcodec/s302menc.c
@@ -22,6 +22,7 @@
#include "avcodec.h"
#include "internal.h"
+#include "mathops.h"
#include "put_bits.h"
#define AES3_HEADER_LEN 4
diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index 9ef629681e..fa6bccc1d0 100644
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@ -25,9 +25,11 @@
*/
#include <float.h>
+
#include "avcodec.h"
#include "internal.h"
#include "fft.h"
+#include "mathops.h"
#include "vorbis.h"
#include "vorbis_enc_data.h"