[FFmpeg-cvslog] Merge commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 20 03:39:04 2014 +0200| [7d25af1547f8d97231f1c6e4cab7ad2bbf1dd071] | committer: Michael Niedermayer

Merge commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37'

* commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37':
  lavf: add av_stream_get_side_data

Conflicts:
	doc/APIchanges
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d25af1547f8d97231f1c6e4cab7ad2bbf1dd071
---