Changeset 50a3c823 in ffmpeg

Timestamp:
Mar 11, 2014, 8:24:54 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
77466876
Parents:
a1b92569 (diff), 908836e2 (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/11/14 20:19:46)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/11/14 20:24:54)
Message:

Merge remote-tracking branch 'qatar/master'

  • qatar/master: doc: Add section about AviSynth support

Conflicts:

doc/general.texi

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

(No files)

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