Merge commit '15e84ed3f141c586e8cb78ed58365cf5a511108a'

Browse Source

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>

pull/200/head

Derek Buitenhuis 9 years ago

parent 6372c9dc99 15e84ed3f1

commit bbf5ef9dac

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available