Changeset 0d22586 in ffmpeg

Timestamp:

Apr 7, 2014, 6:53:34 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7fcb4f6c, f9158b01

Parents:

836b60ce (diff), 17a75a8c (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> (04/07/14 18:19:30)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/07/14 18:53:34)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: libxvid: fix missing end of line character

Conflicts:

libavcodec/libxvid.c

No change as the buggy modification wasnt merged, ffmpeg handles the
case where both lumi and variance masking are set, differently

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

(No files)