diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 13:03:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 13:03:09 +0200 |
| commit | 48480da6ad0f53e8d9d68162e8d003f557221fc2 (patch) | |
| tree | e6032b1df7c55f07d7b677b0e56a8dce5ef82952 /README | |
| parent | bc6e535db13222d7de97b774639e6a7d42afd91c (diff) | |
| parent | 48f2e53ad0c8586369c3ce88712f0b9cec5a4c47 (diff) | |
| download | ffmpeg-48480da6ad0f53e8d9d68162e8d003f557221fc2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: document the asf demuxer
Conflicts:
doc/demuxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions