History

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

Michael Niedermayer committed 14 years ago

Commit f8911b92 parents bf53863 546774245 files · +648 −339Browse files

Showing the changes to libavfilter/avfilter.h (1 of 45 files). Show all

Unified · Split

libavfilter/avfilter.h+5−1
@@ -301,8 +301,12 @@ struct AVFilterPad { · 300 unmodified lines
301301 * and should do its processing.
302302 *
303303 * Input audio pads only.
304+ *
305+ * @return >= 0 on success, a negative AVERROR on error. This function
306+ * must ensure that samplesref is properly unreferenced on error if it
307+ * hasn't been passed on to another filter.
304308 */
305− void (*filter_samples)(AVFilterLink *link, AVFilterBufferRef *samplesref);
309+ int (*filter_samples)(AVFilterLink *link, AVFilterBufferRef *samplesref);
306310
307311 /**
308312 * Frame poll callback. This returns the number of immediately available

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t