Merge commit '2a41826bea3833895dc06939831b7f35ca1f597e'

* commit '2a41826bea3833895dc06939831b7f35ca1f597e': lavc: add HEVC profiles names Conflicts: libavcodec/hevc.c libavcodec/version.h

Michael Niedermayer committed 12 years ago

Commit d6b7ea02 parents 6fc9f5e 2a418263 files · +7 −4Browse files

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

Unified · Split

@@ -37,6 +37,9 @@ API changes, most recent first: · 36 unmodified lines
37	2013-11-XX - xxxxxxx - lavu 52.54.100 - avstring.h	37	2013-11-XX - xxxxxxx - lavu 52.54.100 - avstring.h
38	Add av_utf8_decode() function.	38	Add av_utf8_decode() function.
39		39
		40	2013-11-22 - fb7d70c - lavc 55.44.100 - avcodec.h
		41	Add HEVC profiles
		42
40	2013-11-xx - xxxxxxx - lavc 55.44.100 - avcodec.h	43	2013-11-xx - xxxxxxx - lavc 55.44.100 - avcodec.h
41	Add av_packet_{un,}pack_dictionary()	44	Add av_packet_{un,}pack_dictionary()
42	Add AV_PKT_METADATA_UPDATE side data type, used to transmit key/value	45	Add AV_PKT_METADATA_UPDATE side data type, used to transmit key/value

Keyboard shortcuts