diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 19:40:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 19:40:40 +0100 |
| commit | 5333e0dd66c5695fc708bc9d7af4bf8750674b8f (patch) | |
| tree | 3d840ce14344235aeb0ff14ebd27f747ca6652a3 /libavfilter/asink_anullsink.c | |
| parent | e346a5938317f40410b8f267799f4e2707cf575a (diff) | |
| parent | 57b1eb9f75b04571063ddec316e290c216c114ac (diff) | |
| download | ffmpeg-5333e0dd66c5695fc708bc9d7af4bf8750674b8f.tar.gz | |
Merge commit '57b1eb9f75b04571063ddec316e290c216c114ac'
* commit '57b1eb9f75b04571063ddec316e290c216c114ac':
dcadsp: scan coefficients linearly in dca_lfe_fir
Conflicts:
libavcodec/dcadsp.c
See: 9ae8e23188fc2e533eea74757c9060557941d3d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/asink_anullsink.c')
0 files changed, 0 insertions, 0 deletions