diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 11:36:44 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 11:36:44 +0100 |
| commit | 64ae08ffec1a07803dc1acdb6d0bcd8e628040c2 (patch) | |
| tree | 7b81ce4c89b99c0be0391b840a658efbaaa858a2 /libavcodec/h264_parser.c | |
| parent | c84ba07db4abd123b2ad93784e312a24d9341553 (diff) | |
| parent | 02cd8bb9cb4381c50f42a9284098cc8a33d397db (diff) | |
| download | ffmpeg-64ae08ffec1a07803dc1acdb6d0bcd8e628040c2.tar.gz | |
Merge commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db'
* commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db':
h264: Clean up #includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/h264_parser.c')
| -rw-r--r-- | libavcodec/h264_parser.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 12d6397fad..cbf5b3a4da 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -27,12 +27,22 @@ #define UNCHECKED_BITSTREAM_READER 1 -#include "libavutil/attributes.h" -#include "parser.h" -#include "h264data.h" +#include <assert.h> +#include <stdint.h> + +#include "libavutil/avutil.h" +#include "libavutil/error.h" +#include "libavutil/log.h" +#include "libavutil/mem.h" +#include "libavutil/pixfmt.h" + +#include "get_bits.h" #include "golomb.h" +#include "h264.h" +#include "h264data.h" #include "internal.h" #include "mpegutils.h" +#include "parser.h" typedef struct H264ParseContext { H264Context h; |