]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6372c9d 15e84ed)
Merge commit '15e84ed3f141c586e8cb78ed58365cf5a511108a'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 10 Apr 2016 20:47:26 +0000 (21:47 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 10 Apr 2016 20:47:26 +0000 (21:47 +0100)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.