[FFmpeg-devel] [PATCH 1/3] avcodec/mpegvideo_enc: Combine some checks

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
>  libavcodec/mpegvideo_enc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
> index d33cf9477d..4adb95eca7 100644
> --- a/libavcodec/mpegvideo_enc.c
> +++ b/libavcodec/mpegvideo_enc.c
> @@ -3520,7 +3520,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
>  
>      /* we need to initialize some time vars before we can encode B-frames */
>      // RAL: Condition added for MPEG1VIDEO
> -    if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO || s->codec_id == AV_CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->msmpeg4_version))
> +    if (s->out_format == FMT_MPEG1 || (s->h263_pred && !s->msmpeg4_version))
>          set_frame_distances(s);
>      if(CONFIG_MPEG4_ENCODER && s->codec_id == AV_CODEC_ID_MPEG4)
>          ff_set_mpeg4_time(s);
> @@ -3549,7 +3549,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
>          update_qscale(s);
>      }
>  
> -    if(s->codec_id != AV_CODEC_ID_AMV && s->codec_id != AV_CODEC_ID_MJPEG){
> +    if (s->out_format != FMT_MJPEG) {
>          if(s->q_chroma_intra_matrix   != s->q_intra_matrix  ) av_freep(&s->q_chroma_intra_matrix);
>          if(s->q_chroma_intra_matrix16 != s->q_intra_matrix16) av_freep(&s->q_chroma_intra_matrix16);
>          s->q_chroma_intra_matrix   = s->q_intra_matrix;
> 

Will apply this patchset tonight unless there are objections.

- Andreas