diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-26 01:12:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-26 01:12:08 +0100 |
| commit | 022f8d27dd0a61bfaae729d53d133b17418ea16b (patch) | |
| tree | 351bff9edab8404f7850ee05a238c50e6364e19b /libavfilter/avfilter.h | |
| parent | a11eeb921571b23d1c988f9a2ddda109792948a6 (diff) | |
| parent | f32dfad9dc64acf0fd1bb867e127a9efe6380676 (diff) | |
| download | ffmpeg-022f8d27dd0a61bfaae729d53d133b17418ea16b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: Readd #define _SVID_SOURCE
Fix av_get_channel_layout_string() for positions >31
configure: Store vda lib flags in extralibs instead of ldflags
Make channel layout masks unsigned
dca: ARMv6 optimised decode_blockcode()
nullenc: drop AVFMT_RAWPICTURE from the flags
frame-mt: return consumed packet size in ff_thread_decode_frame
aacdec: add more fate tests covering SBR and PS
MK(BE)TAG: avoid undefined shifts
Conflicts:
configure
libavcodec/arm/dca.h
libavcodec/dca.c
libavcodec/mlp_parser.c
libavcodec/version.h
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/defaults.c
libavutil/audioconvert.c
libavutil/avutil.h
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.h')
| -rw-r--r-- | libavfilter/avfilter.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 5e1cfdba78..d3afc35ebe 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MINOR 49 -#define LIBAVFILTER_VERSION_MICRO 0 +#define LIBAVFILTER_VERSION_MICRO 1 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ @@ -110,7 +110,7 @@ typedef struct AVFilterBuffer { * per reference properties must be separated out. */ typedef struct AVFilterBufferRefAudioProps { - int64_t channel_layout; ///< channel layout of audio buffer + uint64_t channel_layout; ///< channel layout of audio buffer int nb_samples; ///< number of audio samples per channel int sample_rate; ///< audio buffer sample rate int planar; ///< audio buffer - planar or packed @@ -641,7 +641,7 @@ struct AVFilterLink { int h; ///< agreed upon image height AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio /* These parameters apply only to audio */ - int64_t channel_layout; ///< channel layout of current buffer (see libavutil/audioconvert.h) + uint64_t channel_layout; ///< channel layout of current buffer (see libavutil/audioconvert.h) #if LIBAVFILTER_VERSION_MAJOR < 3 int64_t sample_rate; ///< samples per second #else @@ -772,8 +772,7 @@ AVFilterBufferRef *avfilter_get_audio_buffer(AVFilterLink *link, int perms, AVFilterBufferRef * avfilter_get_audio_buffer_ref_from_arrays(uint8_t *data[8], int linesize[8], int perms, int nb_samples, enum AVSampleFormat sample_fmt, - int64_t channel_layout, int planar); - + uint64_t channel_layout, int planar); /** * Request an input frame from the filter at the other end of the link. * |