diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-09 22:10:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-09 22:40:12 +0200 |
| commit | f8911b987de4a84ff8ae92f41ff492ece4acadb9 (patch) | |
| tree | 0ebda51a6ba23d790da30a7168870928954da395 /libavfilter/f_settb.c | |
| parent | bf5386385dc504a076453ad58f61f808677be747 (diff) | |
| parent | 5467742232c312b7d61dca7ac57447f728d8d6c9 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mss3: use standard zigzag table
mss3: split DSP functions that are used in MTS2(MSS4) into separate file
motion-test: do not use getopt()
tcp: add initial timeout limit for incoming connections
configure: Change the rdtsc check to a linker check
avconv: propagate fatal errors from lavfi.
lavfi: add error handling to filter_samples().
fate-run: make avconv() properly deal with multiple inputs.
asplit: don't leak the input buffer.
af_resample: fix request_frame() behavior.
af_asyncts: fix request_frame() behavior.
libx264: support aspect ratio switching
matroskadec: honor error_recognition when encountering unknown elements.
lavr: resampling: add support for s32p, fltp, and dblp internal sample formats
lavr: resampling: add filter type and Kaiser window beta to AVOptions
lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format
lavr: mix: validate internal sample format in ff_audio_mix_init()
Conflicts:
ffmpeg.c
ffplay.c
libavcodec/libx264.c
libavfilter/audio.c
libavfilter/split.c
libavformat/tcp.c
tests/fate-run.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/f_settb.c')
| -rw-r--r-- | libavfilter/f_settb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/f_settb.c b/libavfilter/f_settb.c index 6549a5c26c..3ba35be70e 100644 --- a/libavfilter/f_settb.c +++ b/libavfilter/f_settb.c @@ -117,7 +117,7 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) ff_start_frame(outlink, picref2); } -static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples) +static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples) { AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; @@ -132,7 +132,7 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples) avfilter_unref_buffer(insamples); } - ff_filter_samples(outlink, outsamples); + return ff_filter_samples(outlink, outsamples); } #if CONFIG_SETTB_FILTER |