1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02: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:
Derek Buitenhuis 2016-04-10 21:47:26 +01:00
commit bbf5ef9dac

Diff Content Not Available