Merge commit 'a1859032e39d96352687186fd179e1559dea2aca'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 21:50:12 +0000 (23:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 21:51:41 +0000 (23:51 +0200)
commit8225bf95bc3ffc9757879d2eb092cf3fa9d6b26f
tree7fccffbb13b120396c6f36a61f6b82b1123d86ee
parentdcd2a6ca36a42b39867c39720344422161893178
parenta1859032e39d96352687186fd179e1559dea2aca
Merge commit 'a1859032e39d96352687186fd179e1559dea2aca'

* commit 'a1859032e39d96352687186fd179e1559dea2aca':
  flvdec: Do not default to a video and audio stream

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flvdec.c