[FFmpeg-cvslog] Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 13:41:49 2014 +0100| [595ba3b96258538566d6f42113dd0180aaee87c4] | committer: Michael Niedermayer

Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'

* commit '25b32586566f285d797737863c97a1c5c9c84e2b':
  lavf: add an AVStream field for exporting stream-global side data

Conflicts:
	libavformat/utils.c
	libavformat/version.h

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

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