Changeset d701f599 in ffmpeg

Timestamp:

Jan 6, 2014, 12:31:59 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d1134aba

Parents:

8d86e7b4 (diff), fffca3d2 (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> (01/06/14 12:30:40)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/06/14 12:31:59)

Message:

Merge commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e'

• commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e': 4xm: return a proper error code.

Conflicts:

libavcodec/4xm.c

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

(No files)