diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 21:19:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 21:24:54 +0100 |
| commit | 50a3c823023bbbcdb64375cb64cfbb67c98698a9 (patch) | |
| tree | 6262227e0892e31eff96defc220a7b1c5a2264aa /libavdevice/avdeviceres.rc | |
| parent | a1b92569db6597bb4a662865564e7905a945264f (diff) | |
| parent | 908836e20743d7e9462011a9f30a300a5bf247ca (diff) | |
| download | ffmpeg-50a3c823023bbbcdb64375cb64cfbb67c98698a9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Add section about AviSynth support
Conflicts:
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/avdeviceres.rc')
0 files changed, 0 insertions, 0 deletions