Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 19:34:31 +0000 (21:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 19:34:31 +0000 (21:34 +0200)
commitafd62b3f184569492230e7f34ad55581c6b2d2c3
tree8735bd33eb54b8f60f9e6921ca9cce12fa015a90
parentf95298c913899207344d668a6d5624cb2d2e480c
parentfa14804c83a7108a50c63d1f2180e30c75909529
Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'

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

Conflicts:
libavformat/flvdec.c

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