Michael Niedermayer 625b29037e 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@gmx.at>

2013-11-26 13:00:46 +01:00

67 KiB

Raw Blame History

View Raw