* commit 'afbd4b7e':
  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>