diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 10:38:46 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 10:40:33 +0200 |
commit | c589c4c52d130ab07d0b183db129adcc3bb7d39c (patch) | |
tree | cf72da2ccb18cfbbfd66b4eade1e1cb370291221 /libavfilter/af_resample.c | |
parent | e96c80154f7c8332530b39f490d604d79a106768 (diff) | |
parent | 1cac9accbd1f9b8596122d0735e37b97a844c514 (diff) | |
download | ffmpeg-c589c4c52d130ab07d0b183db129adcc3bb7d39c.tar.gz |
Merge commit '1cac9accbd1f9b8596122d0735e37b97a844c514'
* commit '1cac9accbd1f9b8596122d0735e37b97a844c514':
avi: properly fail if the dv demuxer is missing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_resample.c')
0 files changed, 0 insertions, 0 deletions