Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'

* commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025': mpeg12dec: Extract CC user data into frame side data Conflicts: doc/APIchanges libavutil/version.h

Michael Niedermayer committed 12 years ago

Commit 625b2902 parents cd51d9a 1eaac1d4 files · +78 −1Browse files

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

Unified · Split

doc/APIchanges+4−0

@@ -15,6 +15,10 @@ libavutil: 2012-10-22 · 14 unmodified lines
15	15
16	16	API changes, most recent first:
17	17
	18	+2013-11-xx - xxxxxxx- - lavu 52.19.0 - frame.h
	19	+ Add AV_FRAME_DATA_A53_CC value to the AVFrameSideDataType enum, which
	20	+ identifies ATSC A53 Part 4 Closed Captions data.
	21	+
18	22	2013-11-XX - xxxxxxx - lavu 52.54.100 - avstring.h
19	23	Add av_utf8_decode() function.
20	24

Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code