[FFmpeg-cvslog] Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 24 13:04:34 2014 +0200| [6ef5e292200b6824b666a6a876d344fe7e6a48b2] | committer: Michael Niedermayer

Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2'

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

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

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