Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 13:44:22 +0000 (14:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 13:44:22 +0000 (14:44 +0100)
commit82e6660ae2372cdf96acb3bfebdd82b82f51d23f
treea3b0a2fa89a4a4e936bdd5926e2781db7c33e297
parentc08e523586b6be36bee3f73d609733cd80a57674
parent59444c76e6d43529a12dbd80b6dd29c6ba4079a9
Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'

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

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
ffmpeg.h