[FFmpeg-cvslog] Merge commit '93c04e095dc37ebdab22174e88cfa91e24940866'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 13 23:14:17 2014 +0200| [9f97f7c5463874c60ca9a74bb8b21982e6b8f53d] | committer: Michael Niedermayer

Merge commit '93c04e095dc37ebdab22174e88cfa91e24940866'

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

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

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