diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 13:27:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 13:27:18 +0100 |
| commit | 264441715b132344e15f27f6a5740645d5146f56 (patch) | |
| tree | 9ad81892cf141d8a2e3b09c242498aa425daedcf /libavfilter/asink_anullsink.c | |
| parent | b0d9b011c752f8526b73ffcef727c21f34cc5e46 (diff) | |
| parent | f5fa03660db16f9d78abc5a626438b4d0b54f563 (diff) | |
Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'
* commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563':
vble: Do not abort decoding when version is not 1
lavr: do not pass consumed samples as a parameter to ff_audio_resample()
lavr: correct the documentation for the ff_audio_resample() return value
lavr: do not pass sample count as a parameter to ff_audio_convert()
x86: h264_weight: port to cpuflags
configure: Enable avconv filter dependencies automatically
Conflicts:
configure
libavcodec/x86/h264_weight.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/asink_anullsink.c')
0 files changed, 0 insertions, 0 deletions