Merge commit '93c04e095dc37ebdab22174e88cfa91e24940866'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 21:14:17 +0000 (23:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 21:14:23 +0000 (23:14 +0200)
commit9f97f7c5463874c60ca9a74bb8b21982e6b8f53d
tree5f438eff3e30a682f3ccda6824ffba8eb10ef632
parentf01a1281ee82c82f64f1879d99cce3807f5fcf05
parent93c04e095dc37ebdab22174e88cfa91e24940866
Merge commit '93c04e095dc37ebdab22174e88cfa91e24940866'

* commit '93c04e095dc37ebdab22174e88cfa91e24940866':
  Expose metadata found in onCuePoint events in .flv files.

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