diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:37:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:37:27 +0200 |
| commit | b3fa78cea14c3181e9ff64119856a7fd0b0e8f3a (patch) | |
| tree | 054af321a5ed8de1445832fb66cb00e6302d3a54 /libavcodec/sgidec.c | |
| parent | be4ae3f532d13deb0916f950d3bbc60c0f04fd85 (diff) | |
| parent | e7cd53bf662a93330810981f1d057bdf2ead669e (diff) | |
| download | ffmpeg-b3fa78cea14c3181e9ff64119856a7fd0b0e8f3a.tar.gz | |
Merge commit 'e7cd53bf662a93330810981f1d057bdf2ead669e'
* commit 'e7cd53bf662a93330810981f1d057bdf2ead669e':
sgi: check maximum supported resolution
Conflicts:
libavcodec/sgienc.c
See: 59352cc219c4f933c9a83b45043ec4810c2a51ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sgidec.c')
0 files changed, 0 insertions, 0 deletions