Changeset 905cd28a in ffmpeg

Timestamp:
Feb 4, 2014, 1:33:33 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
cddbe9fa
Parents:
a0d5204c (diff), de203abd (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 'de203abd71baae7f120313259b45cf935c85203e'

Conflicts:

doc/filters.texi
libavfilter/vf_overlay.c

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.