Merge commit 'e7cd53bf'
* commit 'e7cd53bf': sgi: check maximum supported resolution Conflicts: libavcodec/sgienc.c See: 59352cc2Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit 'e7cd53bf': sgi: check maximum supported resolution Conflicts: libavcodec/sgienc.c See: 59352cc2Merged-by: Michael Niedermayer <michaelni@gmx.at>