diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-24 02:08:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-24 03:32:24 +0100 |
| commit | 8e576d58306df95d6373dd0ca2c1f21f1afaeca9 (patch) | |
| tree | 5f7b9c8783b342e80e32b58b94ded819eb414b3c /libavfilter | |
| parent | 7ffa9ea05aa951b6b13e615f1bd3b8280f758561 (diff) | |
| parent | bbb46f3ec7128d8a624f2aa5b4f99ec44c0b9567 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libavutil: add utility functions to simplify allocation of audio buffers.
libavutil: add planar sample formats and av_sample_fmt_is_planar()
avconv: fix segfault at EOF with delayed pictures
pcmdec: remove unneeded resetting of samples pointer
avconv: remove a now unused parameter from output_packet().
avconv: formatting fixes in output_packet()
avconv: declare some variables in blocks where they are used
avconv: use the same behavior when decoding audio/video/subs
bethsoftvideo: return proper consumed size for palette packets.
cdg: skip packets that don't contain a cdg command.
crcenc: add flags
avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
tiffenc: add a private option for selecting compression algorithm
md5enc: add flags
ARM: remove needless .text/.align directives
Conflicts:
doc/APIchanges
libavcodec/tiffenc.c
libavutil/avutil.h
libavutil/samplefmt.c
libavutil/samplefmt.h
tests/ref/fate/bethsoft-vid
tests/ref/fate/cdgraphics
tests/ref/fate/film-cvid-pcm-stereo-8bit
tests/ref/fate/mpeg2-field-enc
tests/ref/fate/nuv
tests/ref/fate/tiertex-seq
tests/ref/fate/tscc-32bit
tests/ref/fate/vmnc-32bit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_aconvert.c | 2 | ||||
| -rw-r--r-- | libavfilter/asrc_abuffer.c | 2 | ||||
| -rw-r--r-- | libavfilter/defaults.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/af_aconvert.c b/libavfilter/af_aconvert.c index 14a9fdcaee..e3c7f8cc3d 100644 --- a/libavfilter/af_aconvert.c +++ b/libavfilter/af_aconvert.c @@ -270,7 +270,7 @@ static int init_buffers(AVFilterLink *inlink, int nb_samples) int nb_channels = av_get_channel_layout_nb_channels(outlink->channel_layout); if (av_samples_alloc(data, linesize, nb_channels, nb_samples, - inlink->format, inlink->planar, 16) < 0) + inlink->format, 16) < 0) goto fail_no_mem; aconvert->mix_samplesref = avfilter_get_audio_buffer_ref_from_arrays(data, linesize, AV_PERM_WRITE, diff --git a/libavfilter/asrc_abuffer.c b/libavfilter/asrc_abuffer.c index 0cb9842079..ad71e12c5b 100644 --- a/libavfilter/asrc_abuffer.c +++ b/libavfilter/asrc_abuffer.c @@ -241,7 +241,7 @@ int av_asrc_buffer_add_buffer(AVFilterContext *ctx, av_samples_fill_arrays(data, linesize, buf, nb_channels, nb_samples, - sample_fmt, planar, 16); + sample_fmt, 16); return av_asrc_buffer_add_samples(ctx, data, linesize, nb_samples, diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index 79fb38d70f..c962764db0 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -91,7 +91,7 @@ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int per /* Calculate total buffer size, round to multiple of 16 to be SIMD friendly */ if (av_samples_alloc(data, linesize, nb_channels, nb_samples, link->format, - link->planar, 16) < 0) + 16) < 0) return NULL; samplesref = |