Changeset be4ae3f5 in ffmpeg

Timestamp:
Apr 1, 2014, 1:29:29 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
b3fa78ce
Parents:
0054bbd6 (diff), a7dbfcf6 (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.
Message:

Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'

Conflicts:

libavcodec/sgidec.c
libavcodec/sgienc.c

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

(No files)

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