Changeset d128794 in ffmpeg

Timestamp:

Feb 17, 2015, 10:13:12 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

41572ac6

Parents:

2e786bc4 (diff), a1e2c47c (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> (02/17/15 22:12:29)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/17/15 22:13:12)

Message:

Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'

• commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012': libxvid: Return meaningful error messages

Conflicts:

libavcodec/libxvid.c
libavcodec/libxvid_rc.c

See: 2a89afb376aebe833bee0b5958cec16c48936b03 and others
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)