Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Oct 2014 11:04:34 +0000 (13:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Oct 2014 11:14:33 +0000 (13:14 +0200)
commit6ef5e292200b6824b666a6a876d344fe7e6a48b2
tree79c7ba1c956938f574846474fb4568ce694a10e8
parent7ad34f445648b8f0e8e15d67ccd61ca4c9192cdf
parent88b32673db39440422a73ec3047d3326c96b4fb2
Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2'

* commit '88b32673db39440422a73ec3047d3326c96b4fb2':
  avconv: copy stream-level side data when streamcopying

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