Merge commit 'a3a0230a9870b9018dc7415ae5872784d524cfe5'

Browse Source

* commit 'a3a0230a9870b9018dc7415ae5872784d524cfe5':
  avconv: init filtergraphs only after we have a frame on each input

This commit is a noop since it doesn't apply cleanly due to differences
in the dataflow between avconv and ffmpeg, and thus fixing this in the
scope of a merge is unfeasible.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

...

This commit is contained in:

Hendrik Leppkes 2016-11-13 17:25:05 +01:00

parent f761d49670 a3a0230a98

commit 7c282d0c75

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available