[FFmpeg-cvslog] Merge commit 'a1859032e39d96352687186fd179e1559dea2aca'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun  1 23:50:12 2014 +0200| [8225bf95bc3ffc9757879d2eb092cf3fa9d6b26f] | committer: Michael Niedermayer

Merge commit 'a1859032e39d96352687186fd179e1559dea2aca'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8225bf95bc3ffc9757879d2eb092cf3fa9d6b26f
---