[FFmpeg-devel] [PATCH] avcodec/mpeg12enc: replace return -1 with proper error codes

[Nicolas George]

lance.lmwang at gmail.com (12020-05-07):
> From: Limin Wang <lance.lmwang at gmail.com>
> 
> Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
> ---
>  libavcodec/mpeg12enc.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
> index 643ba81..f317c63 100644
> --- a/libavcodec/mpeg12enc.c
> +++ b/libavcodec/mpeg12enc.c
> @@ -142,13 +142,13 @@ static av_cold int encode_init(AVCodecContext *avctx)
>      MpegEncContext *s = avctx->priv_data;
>  

>      if (ff_mpv_encode_init(avctx) < 0)
                                    ^^^^
> -        return -1;
> +        return AVERROR(EINVAL);

You have an accurate return code available.

>  
>      if (find_frame_rate_index(s) < 0) {
>          if (s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
>              av_log(avctx, AV_LOG_ERROR, "MPEG-1/2 does not support %d/%d fps\n",
>                     avctx->time_base.den, avctx->time_base.num);
> -            return -1;
> +            return AVERROR(EINVAL);
>          } else {
>              av_log(avctx, AV_LOG_INFO,
>                     "MPEG-1/2 does not support %d/%d fps, there may be AV sync issues\n",
> @@ -159,7 +159,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
>      if (avctx->profile == FF_PROFILE_UNKNOWN) {
>          if (avctx->level != FF_LEVEL_UNKNOWN) {
>              av_log(avctx, AV_LOG_ERROR, "Set profile and level\n");
> -            return -1;
> +            return AVERROR(EINVAL);
>          }
>          /* Main or 4:2:2 */
>          avctx->profile = s->chroma_format == CHROMA_420 ? FF_PROFILE_MPEG2_MAIN : FF_PROFILE_MPEG2_422;
> @@ -175,7 +175,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
>              if (avctx->profile != FF_PROFILE_MPEG2_HIGH && s->chroma_format != CHROMA_420) {
>                  av_log(avctx, AV_LOG_ERROR,
>                         "Only High(1) and 4:2:2(0) profiles support 4:2:2 color sampling\n");
> -                return -1;
> +                return AVERROR(EINVAL);
>              }
>              if (avctx->width <= 720 && avctx->height <= 576)
>                  avctx->level = 8;                   /* Main */
> @@ -205,7 +205,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
>      if (s->drop_frame_timecode && s->frame_rate_index != 4) {
>          av_log(avctx, AV_LOG_ERROR,
>                 "Drop frame time code only allowed with 1001/30000 fps\n");
> -        return -1;
> +        return AVERROR(EINVAL);
>      }
>  
>  #if FF_API_PRIVATE_OPT

Regards,

-- 
  Nicolas George
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20200507/b0b6c9d0/attachment.sig>