diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 23:50:12 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 23:51:41 +0200 |
commit | 8225bf95bc3ffc9757879d2eb092cf3fa9d6b26f (patch) | |
tree | 7fccffbb13b120396c6f36a61f6b82b1123d86ee /doc/libswresample.texi | |
parent | dcd2a6ca36a42b39867c39720344422161893178 (diff) | |
parent | a1859032e39d96352687186fd179e1559dea2aca (diff) | |
download | ffmpeg-8225bf95bc3ffc9757879d2eb092cf3fa9d6b26f.tar.gz |
Merge commit 'a1859032e39d96352687186fd179e1559dea2aca'
* commit 'a1859032e39d96352687186fd179e1559dea2aca':
flvdec: Do not default to a video and audio stream
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/libswresample.texi')
0 files changed, 0 insertions, 0 deletions