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)
* commit '93c04e095dc37ebdab22174e88cfa91e24940866':
  Expose metadata found in onCuePoint events in .flv files.

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

Simple merge