Changeset b3fa78ce in ffmpeg

Timestamp:

Apr 1, 2014, 1:37:27 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

013aa222

Parents:

be4ae3f5 (diff), e7cd53bf (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/01/14 01:37:02)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/01/14 01:37:27)

Message:

Merge commit 'e7cd53bf662a93330810981f1d057bdf2ead669e'

• commit 'e7cd53bf662a93330810981f1d057bdf2ead669e': sgi: check maximum supported resolution

Conflicts:

libavcodec/sgienc.c

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

(No files)