FFmpeg/libavcodec
Michael Niedermayer b3fa78cea1 Merge commit 'e7cd53bf662a93330810981f1d057bdf2ead669e'
* commit 'e7cd53bf662a93330810981f1d057bdf2ead669e':
  sgi: check maximum supported resolution

Conflicts:
	libavcodec/sgienc.c

See: 59352cc219c4f933c9a83b45043ec4810c2a51ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 03:37:27 +02:00
..
2014-04-01 01:13:09 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-03-22 03:12:18 +01:00
2014-03-25 13:29:05 +01:00
2014-03-26 04:20:52 +01:00
2014-03-31 01:11:16 +02:00
2014-04-01 01:13:09 +02:00
2014-03-29 18:13:15 +01:00
2014-03-27 23:57:51 +01:00