Changeset 2fb0027c in ffmpeg

Timestamp:
Mar 6, 2014, 12:07:20 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
7011aab5
Parents:
b7605905 (diff), 599b81ca (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.
git-author:
Michael Niedermayer <michaelni@gmx.at> (03/06/14 11:51:10)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/06/14 12:07:20)
Message:

Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'

Conflicts:

Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h

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

(No files)

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