diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 19:09:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 19:09:12 +0100 |
| commit | c0caf7e81493f5d9d4acd013892b651ab39be450 (patch) | |
| tree | 382ed15901eab689aacd1bfb41a645f85b5fdc19 /libavformat/nsvdec.c | |
| parent | c8a0a2e990ba80fefe96c3aa6e9ed46bc6001e3a (diff) | |
| parent | dd249245d012c1eceb57c166e256fc95e74f4bb1 (diff) | |
| download | ffmpeg-c0caf7e81493f5d9d4acd013892b651ab39be450.tar.gz | |
Merge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1'
* commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1':
filter docs: reference scale and fps filters
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nsvdec.c')
0 files changed, 0 insertions, 0 deletions