[FFmpeg-cvslog] Merge commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d'
Michael Niedermayer
git at videolan.org
Wed Aug 13 22:31:41 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 13 22:22:52 2014 +0200| [ed8e6d535cf4c56d82f9c91646dfc42787b719d6] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed8e6d535cf4c56d82f9c91646dfc42787b719d6
---
More information about the ffmpeg-cvslog
mailing list