aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/sgienc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-01 03:37:02 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-01 03:37:27 +0200
commitb3fa78cea14c3181e9ff64119856a7fd0b0e8f3a (patch)
tree054af321a5ed8de1445832fb66cb00e6302d3a54 /libavcodec/sgienc.c
parentbe4ae3f532d13deb0916f950d3bbc60c0f04fd85 (diff)
parente7cd53bf662a93330810981f1d057bdf2ead669e (diff)
downloadffmpeg-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/sgienc.c')
-rw-r--r--libavcodec/sgienc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c
index c22535421c..a809d5c0b2 100644
--- a/libavcodec/sgienc.c
+++ b/libavcodec/sgienc.c
@@ -31,9 +31,12 @@
static av_cold int encode_init(AVCodecContext *avctx)
{
if (avctx->width > 65535 || avctx->height > 65535) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Unsupported resolution %dx%d.\n", avctx->width, avctx->height);
av_log(avctx, AV_LOG_ERROR, "SGI does not support resolutions above 65535x65535\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
+
avctx->coded_frame = av_frame_alloc();
if (!avctx->coded_frame)
return AVERROR(ENOMEM);