[FFmpeg-cvslog] Merge commit '15e84ed3f141c586e8cb78ed58365cf5a511108a'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 10 21:47:26 2016 +0100| [bbf5ef9dac9475d8ed22da23acc2eb63a2640784] | committer: Derek Buitenhuis

Merge commit '15e84ed3f141c586e8cb78ed58365cf5a511108a'

This commit is a no-op. We want to do this ourselves, since avconv and ffmpeg
differ quite a bit.

* commit '15e84ed3f141c586e8cb78ed58365cf5a511108a':
  avconv: convert to codecpar

Merged-by: Derek Buitenhuis <derek.butienhuis at gmail.com>

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