diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 10:54:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 11:22:28 +0200 |
| commit | dd0429e1de54a6f583384cde010967cad7c10688 (patch) | |
| tree | a45a2f73f3b6f5dcefc0ae9efdb7a6203c142e46 /libavfilter/af_resample.c | |
| parent | c589c4c52d130ab07d0b183db129adcc3bb7d39c (diff) | |
| parent | 756547ce7f4d67a18663503e2157aebed3531703 (diff) | |
| download | ffmpeg-dd0429e1de54a6f583384cde010967cad7c10688.tar.gz | |
Merge commit '756547ce7f4d67a18663503e2157aebed3531703'
* commit '756547ce7f4d67a18663503e2157aebed3531703':
avi: DV in AVI must be considered single stream
Conflicts:
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_resample.c')
0 files changed, 0 insertions, 0 deletions