# HG changeset patch # User stefano # Date 1274565126 0 # Node ID 746b2040c34e4c48569f9e4c06a7b6169aca995e # Parent bf6169d77dbde56396c1af32c5c20c4e99ad96f6 Make av_write_header() return AVERROR(EINVAL) rather than -1 if the input parameters are not valid. diff -r bf6169d77dbd -r 746b2040c34e utils.c --- a/utils.c Sat May 22 21:52:02 2010 +0000 +++ b/utils.c Sat May 22 21:52:06 2010 +0000 @@ -2609,7 +2609,7 @@ // some sanity checks if (s->nb_streams == 0) { av_log(s, AV_LOG_ERROR, "no streams\n"); - return -1; + return AVERROR(EINVAL); } for(i=0;inb_streams;i++) { @@ -2619,7 +2619,7 @@ case AVMEDIA_TYPE_AUDIO: if(st->codec->sample_rate<=0){ av_log(s, AV_LOG_ERROR, "sample rate not set\n"); - return -1; + return AVERROR(EINVAL); } if(!st->codec->block_align) st->codec->block_align = st->codec->channels * @@ -2628,15 +2628,15 @@ case AVMEDIA_TYPE_VIDEO: if(st->codec->time_base.num<=0 || st->codec->time_base.den<=0){ //FIXME audio too? av_log(s, AV_LOG_ERROR, "time base not set\n"); - return -1; + return AVERROR(EINVAL); } if((st->codec->width<=0 || st->codec->height<=0) && !(s->oformat->flags & AVFMT_NODIMENSIONS)){ av_log(s, AV_LOG_ERROR, "dimensions not set\n"); - return -1; + return AVERROR(EINVAL); } if(av_cmp_q(st->sample_aspect_ratio, st->codec->sample_aspect_ratio)){ av_log(s, AV_LOG_ERROR, "Aspect ratio mismatch between encoder and muxer layer\n"); - return -1; + return AVERROR(EINVAL); } break; }