diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-15 02:40:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-15 02:40:44 +0100 |
| commit | 29df24252aa920dfa7ad538b76b7f03d68f8e426 (patch) | |
| tree | fc222826e048e655f6aa15c67b2e6e06289179a8 /libavformat/ffmenc.c | |
| parent | f800cacada795018c2b7be1f0c0e637b2ee7aef7 (diff) | |
| parent | 2b9ee7d5b901e0d7ba617511e4ed31d3043894d3 (diff) | |
| download | ffmpeg-29df24252aa920dfa7ad538b76b7f03d68f8e426.tar.gz | |
Merge commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3' into release/2.2
* commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3':
doc: Add section about AviSynth support
Conflicts:
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmenc.c')
0 files changed, 0 insertions, 0 deletions