Michael Niedermayer 7d25af1547 Merge commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37'
* commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37':
  lavf: add av_stream_get_side_data

Conflicts:
	doc/APIchanges
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 03:39:04 +02:00
..
2014-05-17 04:57:35 +02:00
2014-04-11 17:51:33 +02:00
2014-05-10 00:06:32 +02:00
2013-08-29 22:52:04 +02:00