aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-19 04:43:53 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-19 04:44:08 +0100
commit445ec2dfcbdc448fb9e6c88049d815f663fcb8a2 (patch)
tree9af4db8c0ed77b7578530b135cfd7871b929139f
parent6781ec6714329da32b2e08be78e951ad1eb71534 (diff)
parentac467d94fa6d9d626f77d4ca8125a5eb1ad5425d (diff)
downloadffmpeg-445ec2dfcbdc448fb9e6c88049d815f663fcb8a2.tar.gz
Merge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'
* commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d': lcl: return an appropriate error code Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/lclenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c
index 201d357898..864adc9850 100644
--- a/libavcodec/lclenc.c
+++ b/libavcodec/lclenc.c
@@ -165,7 +165,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
zret = deflateInit(&c->zstream, c->compression);
if (zret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Deflate init error: %d\n", zret);
- return 1;
+ return AVERROR_UNKNOWN;
}
return 0;