Changeset 84bc3170 in ffmpeg

Timestamp:

Aug 6, 2013, 8:08:17 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3fa72de8

Parents:

bb5ef961 (diff), 2e661f26 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '2e661f26f8b12195f75ae3b07d9591e395135bc7'

• commit '2e661f26f8b12195f75ae3b07d9591e395135bc7': avconv: insert extra filters in the same way for both graph inputs and outputs

Conflicts:

ffmpeg_filter.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)