virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/snowenc: Replace "return -1" by named constants

Browse Source 
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2017-09-23 02:19:25 +02:00
parent 00a1e1337f
commit 9cec174247
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/snowenc.c
View File

@@ -50,7 +50,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
&& (avctx->flags & AV_CODEC_FLAG_QSCALE) && (avctx->flags & AV_CODEC_FLAG_QSCALE)
&& avctx->global_quality == 0){ && avctx->global_quality == 0){
av_log(avctx, AV_LOG_ERROR, "The 9/7 wavelet is incompatible with lossless mode.\n"); 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 #if FF_API_MOTION_EST
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
@@ -107,8 +107,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if((avctx->flags&AV_CODEC_FLAG_PASS2) || !(avctx->flags&AV_CODEC_FLAG_QSCALE)){ if((avctx->flags&AV_CODEC_FLAG_PASS2) || !(avctx->flags&AV_CODEC_FLAG_QSCALE)){
if(ff_rate_control_init(&s->m) < 0) ret = ff_rate_control_init(&s->m);
return -1; if(ret < 0)
return ret;
} }
s->pass1_rc= !(avctx->flags & (AV_CODEC_FLAG_QSCALE|AV_CODEC_FLAG_PASS2)); s->pass1_rc= !(avctx->flags & (AV_CODEC_FLAG_QSCALE|AV_CODEC_FLAG_PASS2));
@@ -130,7 +131,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
break;*/ break;*/
default: default:
av_log(avctx, AV_LOG_ERROR, "pixel format not supported\n"); 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); avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_h_shift, &s->chroma_v_shift);
@@ -833,7 +834,7 @@ static int encode_subband_c0run(SnowContext *s, SubBand *b, const IDWTELEM *src,
for(y=0; y<h; y++){ for(y=0; y<h; y++){
if(s->c.bytestream_end - s->c.bytestream < w*40){ if(s->c.bytestream_end - s->c.bytestream < w*40){
av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
return -1; return AVERROR(ENOMEM);
} }
for(x=0; x<w; x++){ for(x=0; x<w; x++){
int v, p=0; int v, p=0;