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 /libavformat | |
| 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 '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 | 7 |
5 files changed, 13 insertions, 7 deletions
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; |