[FFmpeg-cvslog] Merge commit 'e7cd53bf662a93330810981f1d057bdf2ead669e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  1 03:37:02 2014 +0200| [b3fa78cea14c3181e9ff64119856a7fd0b0e8f3a] | committer: Michael Niedermayer

Merge commit 'e7cd53bf662a93330810981f1d057bdf2ead669e'

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

Conflicts:
	libavcodec/sgienc.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3fa78cea14c3181e9ff64119856a7fd0b0e8f3a
---