Merge commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 20:22:52 +0000 (22:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 20:22:52 +0000 (22:22 +0200)
commited8e6d535cf4c56d82f9c91646dfc42787b719d6
treee7b1317c403a147ff633193417164e80d56f269e
parentec14f53dbd02d4bbe12d8895370170804ab40779
parentafbd4b7e093adf6d7a830b32759ca3ba8500363d
Merge commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d'

* commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d':
  lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen.

Conflicts:
libavformat/avformat.h
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavformat/avformat.h
libavformat/version.h