Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'

* commit '25b32586566f285d797737863c97a1c5c9c84e2b': lavf: add an AVStream field for exporting stream-global side data Conflicts: libavformat/utils.c libavformat/version.h

Michael Niedermayer committed 12 years ago

Commit 595ba3b2 parents bd34e26 25b32584 files · +34 −2Browse 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	+2014-02-xx - xxxxxxx - lavf 55.13.0 - avformat.h
	19	+ Add AVStream.side_data and AVStream.nb_side_data for exporting stream-global
	20	+ side data (e.g. replaygain tags, video rotation)
	21	+
18	22	2014-02-xx - xxxxxxx - lavc 55.35.0 - avcodec.h
19	23	Give the name AVPacketSideData to the previously anonymous struct used for
20	24	AVPacket.side_data.

Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code