diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-13 21:04:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-13 22:43:57 +0200 |
| commit | c7b9eab2be7099b0d4f2fed4feaf69a7dda379f0 (patch) | |
| tree | 019d5b0a7eaa5e15782ec67d61100d9a3f91e916 /libavfilter/audio.h | |
| parent | 4a6d790a6fc0de15112a7bbfe8b2b58ef058a48d (diff) | |
| parent | 8517e9c476e8cf92d9ed25b6486bb43d3dc2c49d (diff) | |
| download | ffmpeg-c7b9eab2be7099b0d4f2fed4feaf69a7dda379f0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Add a new option 'rtmp_buffer', for setting the client buffer time
rtmp: Set the client buffer time to 3s instead of 0.26s
rtmp: Handle server bandwidth packets
rtmp: Display a verbose message when an unknown packet type is received
lavfi/audio: use av_samples_copy() instead of custom code.
configure: add all filters hardcoded into avconv to avconv_deps
avfiltergraph: remove a redundant call to avfilter_get_by_name().
lavfi: allow building without swscale.
build: Do not delete tests/vsynth2 directory, which is no longer created.
lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs
lavfi: make AVFilterPad opaque after two major bumps.
lavfi: add avfilter_pad_get_type() and avfilter_pad_get_name().
lavfi: make avfilter_get_video_buffer() private on next bump.
jack: update to new latency range API as the old one has been deprecated
rtmp: Tokenize the AMF connection parameters manually instead of using strtok_r
ppc: Rename H.264 optimization template file for consistency.
lavfi: add channelsplit audio filter.
golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls()
sws: fix planar RGB input conversions for 9/10/16 bpp.
Conflicts:
Changelog
configure
doc/APIchanges
ffmpeg.c
libavcodec/golomb.h
libavcodec/v210dec.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
libavfilter/formats.c
libavfilter/version.h
libavfilter/vf_frei0r.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/video.h
libavfilter/vsrc_color.c
libavformat/rtmpproto.c
libswscale/input.c
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/audio.h')
| -rw-r--r-- | libavfilter/audio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/audio.h b/libavfilter/audio.h index b63f85f45c..e361edc5f8 100644 --- a/libavfilter/audio.h +++ b/libavfilter/audio.h @@ -24,7 +24,7 @@ #include "avfilter.h" -static const enum AVSampleFormat ff_packed_sample_fmts[] = { +static const enum AVSampleFormat ff_packed_sample_fmts_array[] = { AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, @@ -33,7 +33,7 @@ static const enum AVSampleFormat ff_packed_sample_fmts[] = { AV_SAMPLE_FMT_NONE }; -static const enum AVSampleFormat ff_planar_sample_fmts[] = { +static const enum AVSampleFormat ff_planar_sample_fmts_array[] = { AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, |