Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

* commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619': lavc: give a typedeffed name to the AVPacket.side_data struct Conflicts: doc/APIchanges libavcodec/version.h

Michael Niedermayer committed 12 years ago

Commit bd34e262 parents 9456a86 0e2c3ee3 files · +13 −7Browse files

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

Unified · Split

doc/APIchanges+4−0

@@ -15,6 +15,10 @@ libavutil: 2012-10-22 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2014-02-xx - xxxxxxx - lavc 55.35.0 - avcodec.h
		19	Give the name AVPacketSideData to the previously anonymous struct used for
		20	AVPacket.side_data.
		21
18	2014-03-18 - 37c07d4 - lsws 2.5.102	22	2014-03-18 - 37c07d4 - lsws 2.5.102
19	Make gray16 full-scale.	23	Make gray16 full-scale.
20		24

Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code