Signed-off-by: Michael Niedermayer <[email protected]>
---
libavcodec/snowenc.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index bb113d0a2b..f5497f958c 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -50,7 +50,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
&& (avctx->flags & AV_CODEC_FLAG_QSCALE)
&& avctx->global_quality == 0){
av_log(avctx, AV_LOG_ERROR, "The 9/7 wavelet is incompatible with
lossless mode.\n");
- return -1;
+ return AVERROR(EINVAL);
}
#if FF_API_MOTION_EST
FF_DISABLE_DEPRECATION_WARNINGS
@@ -107,8 +107,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
return AVERROR(ENOMEM);
}
if((avctx->flags&AV_CODEC_FLAG_PASS2) ||
!(avctx->flags&AV_CODEC_FLAG_QSCALE)){
- if(ff_rate_control_init(&s->m) < 0)
- return -1;
+ if((ret = ff_rate_control_init(&s->m)) < 0)
+ return ret;
}
s->pass1_rc= !(avctx->flags & (AV_CODEC_FLAG_QSCALE|AV_CODEC_FLAG_PASS2));
@@ -130,7 +130,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
break;*/
default:
av_log(avctx, AV_LOG_ERROR, "pixel format not supported\n");
- return -1;
+ return AVERROR_PATCHWELCOME;
}
avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_h_shift,
&s->chroma_v_shift);
@@ -833,7 +833,7 @@ static int encode_subband_c0run(SnowContext *s, SubBand *b,
const IDWTELEM *src,
for(y=0; y<h; y++){
if(s->c.bytestream_end - s->c.bytestream < w*40){
av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
- return -1;
+ return AVERROR(ENOMEM);
}
for(x=0; x<w; x++){
int v, p=0;
--
2.14.1
_______________________________________________
ffmpeg-devel mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
