Michael Niedermayer 97a407f696 Merge commit '6fe2641d6e410b7bc203138fa97e1118b411f16d' ...

* commit '6fe2641d6e410b7bc203138fa97e1118b411f16d':
  lavc: add profile define for DTS Express

Conflicts:
	doc/APIchanges
	libavcodec/version.h

See: 11fe56c8bb
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-03-29 12:24:33 +02:00

87 KiB

Raw Blame History

View Raw