Changeset 911a100 in ffmpeg

Timestamp:

Sep 6, 2013, 11:52:59 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

898c6191

Parents:

86ca6a75 (diff), c16ddcc9 (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> (09/06/13 11:50:46)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/06/13 11:52:59)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: avisynth: K&R formatting cosmetics

Conflicts:

libavformat/avisynth.c

Nothing changed as the avisynth code has been rewritten to
support avi/avxsynth in ffmpeg.
And the new code should be free of formating problems.

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

(No files)