Merge commit '6fe2641d6e410b7bc203138fa97e1118b411f16d'

* commit '6fe2641d6e410b7bc203138fa97e1118b411f16d': lavc: add profile define for DTS Express Conflicts: doc/APIchanges libavcodec/version.h

Michael Niedermayer committed 11 years ago

Commit 97a407f2 parents 268ff17 6fe26411 file · +3 −0Browse files

Showing the changes to doc/APIchanges (1 of 1 file). Show all

Unified · Split

@@ -18,6 +18,9 @@ API changes, most recent first: · 17 unmodified lines
18	18	2015-xx-xx - xxxxxxx - lavu 54.21.100 / 54.10.0
19	19	Add AV_PIX_FMT_MMAL for MMAL hardware acceleration.
20	20
	21	+2015-xx-xx - xxxxxxx - 56.29.100 / lavc 56.22.0
	22	+ Add FF_PROFILE_DTS_EXPRESS.
	23	+
21	24	-------- 8< --------- FFmpeg 2.6 was cut here -------- 8< ---------
22	25
23	26	2015-03-04 - cca4476 - lavf 56.25.100

Keyboard shortcuts