mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 12:09:55 +00:00
Merge commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db'
* commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db': h264: Clean up #includes Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
commit
64ae08ffec
@ -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;
|
||||
|
@ -19,13 +19,19 @@
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/cpu.h"
|
||||
#include "libavutil/intreadwrite.h"
|
||||
#include "libavutil/mem.h"
|
||||
#include "libavutil/ppc/cpu.h"
|
||||
#include "libavutil/ppc/types_altivec.h"
|
||||
#include "libavutil/ppc/util_altivec.h"
|
||||
#include "libavcodec/h264data.h"
|
||||
|
||||
#include "libavcodec/h264.h"
|
||||
#include "libavcodec/h264dsp.h"
|
||||
|
||||
#if HAVE_ALTIVEC
|
||||
|
Loading…
Reference in New Issue
Block a user