Merge commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37'

* commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37': lavf: add av_stream_get_side_data Conflicts: doc/APIchanges libavformat/version.h

Michael Niedermayer committed 12 years ago

Commit 7d25af12 parents 9e6769d c23c96b4 files · +32 −2Browse files

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

Unified · Split

@@ -15,6 +15,10 @@ libavutil: 2012-10-22 · 14 unmodified lines
15	15
16	16	API changes, most recent first:
17	17
	18	+2014-05-19 - xxxxxxx - lavf 55.18.0 - avformat.h
	19	+ Add av_stream_get_side_data() to access stream-level side data
	20	+ in the same way as av_packet_get_side_data().
	21	+
18	22	2014-05-xx - xxxxxxx - lavu 52.86.100 - fifo.h
19	23	Add av_fifo_alloc_array() function.
20	24

Keyboard shortcuts