diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 12:09:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 12:09:41 +0200 |
| commit | f0ee0341b069818d466bc03709c48e6cc6bef9c5 (patch) | |
| tree | 76207ae17e151420f8e7bbd2bcd62f9d027c7f37 /doc/ffserver.texi | |
| parent | 946902e5b9c2574969ac239b2dfb4d88e069fa29 (diff) | |
| parent | 6258d362b82934a2c27557e0984aed372d98091a (diff) | |
| download | ffmpeg-f0ee0341b069818d466bc03709c48e6cc6bef9c5.tar.gz | |
Merge commit '6258d362b82934a2c27557e0984aed372d98091a'
* commit '6258d362b82934a2c27557e0984aed372d98091a':
ac3: Do not clash with normal AVERROR
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffserver.texi')
0 files changed, 0 insertions, 0 deletions