[FFmpeg-cvslog] Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  1 21:34:31 2014 +0200| [afd62b3f184569492230e7f34ad55581c6b2d2c3] | committer: Michael Niedermayer

Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'

* commit 'fa14804c83a7108a50c63d1f2180e30c75909529':
  flv: Index the audio stream

Conflicts:
	libavformat/flvdec.c

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

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