mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-28 10:22:10 +00:00
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@gmail.com>
This commit is contained in:
commit
bbf5ef9dac