mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-08 06:09:50 +00:00
Merge commit '15e84ed3f1'
This commit is a no-op. We want to do this ourselves, since avconv and ffmpeg
differ quite a bit.
* commit '15e84ed3f1':
avconv: convert to codecpar
Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>
This commit is contained in:
commit
bbf5ef9dac