Merge commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d'

Browse Source

* commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d':
  avfilter: Support both syntaxes for the scale filter

Not merged, ffmpeg has much more flexible option handling

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

...

This commit is contained in:

Hendrik Leppkes 2015-09-16 11:20:42 +02:00

parent c2972a2800 285fe5b098

commit 643a156002

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