[FFmpeg-cvslog] Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 14:44:22 2014 +0100| [82e6660ae2372cdf96acb3bfebdd82b82f51d23f] | committer: Michael Niedermayer

Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'

* commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9':
  avconv: add stream-global side data to the first demuxed packet

Conflicts:
	ffmpeg.c

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

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