[FFmpeg-cvslog] Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'

Michael Niedermayer git at videolan.org
Tue Nov 26 13:11:16 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 26 13:00:46 2013 +0100| [625b29037e52bf46c15a7a1fccc83f6ef1647225] | committer: Michael Niedermayer

Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'

* commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025':
  mpeg12dec: Extract CC user data into frame side data

Conflicts:
	doc/APIchanges
	libavutil/version.h

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

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





More information about the ffmpeg-cvslog mailing list