diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-19 13:00:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-19 13:00:31 +0200 |
| commit | 3c7650a83d3bdca2fd680af722de344b092f65ec (patch) | |
| tree | a41bd4809a90135ba39cc464e283663a8ed27672 /cmdutils.h | |
| parent | 75a37b57a59f6701d9443c5f7a0ceec108b27a18 (diff) | |
| parent | ea91e77127229015d23a046f1797d3fc6a33e54d (diff) | |
| download | ffmpeg-3c7650a83d3bdca2fd680af722de344b092f65ec.tar.gz | |
Merge remote-tracking branch 'qatar/master'
This early morning merge should fix --disable-yasm
* qatar/master:
Clean up #includes in cmdutils.h.
g729: Merge g729.h into g729dec.c.
10l: wrap float_interleave functions in HAVE_YASM.
Conflicts:
libavcodec/g729.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.h')
| -rw-r--r-- | cmdutils.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cmdutils.h b/cmdutils.h index d460200f4e..5a9314681a 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -22,8 +22,10 @@ #ifndef FFMPEG_CMDUTILS_H #define FFMPEG_CMDUTILS_H -#include <inttypes.h> +#include <stdint.h> + #include "libavcodec/avcodec.h" +#include "libavfilter/avfilter.h" #include "libavformat/avformat.h" #include "libswscale/swscale.h" @@ -255,9 +257,6 @@ int read_file(const char *filename, char **bufptr, size_t *size); FILE *get_preset_file(char *filename, size_t filename_size, const char *preset_name, int is_path, const char *codec_name); -#if CONFIG_AVFILTER -#include "libavfilter/avfilter.h" - typedef struct { enum PixelFormat pix_fmt; } FFSinkContext; @@ -273,6 +272,4 @@ extern AVFilter ffsink; int get_filtered_video_frame(AVFilterContext *sink, AVFrame *frame, AVFilterBufferRef **picref, AVRational *pts_tb); -#endif /* CONFIG_AVFILTER */ - #endif /* FFMPEG_CMDUTILS_H */ |