avcodec/m[jx]pegdec: Simplify freeing frame

mkver · mkver · commit 1267273663a5 · 2025-04-09T13:52:29.000+02:00
Signed-off-by: Andreas Rheinhardt &lt;andreas.rheinhardt@outlook.com&gt;
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
@@ -2954,11 +2954,8 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx)
         av_log(avctx, AV_LOG_INFO, "Single field\n");
     }
 
-    if (s->picture) {
-        av_frame_free(&s->picture);
-        s->picture_ptr = NULL;
-    } else if (s->picture_ptr)
-        av_frame_unref(s->picture_ptr);
+    av_frame_free(&s->picture);
+    s->picture_ptr = NULL;
 
     av_frame_free(&s->smv_frame);
 
diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c
@@ -47,10 +47,8 @@ typedef struct MXpegDecodeContext {
 static av_cold int mxpeg_decode_end(AVCodecContext *avctx)
 {
     MXpegDecodeContext *s = avctx->priv_data;
-    MJpegDecodeContext *jpg = &s->jpg;
     int i;
 
-    jpg->picture_ptr = NULL;
     ff_mjpeg_decode_end(avctx);
 
     for (i = 0; i < 2; ++i)

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,8 @@ typedef struct MXpegDecodeContext {`
`47`	`47`	`static av_cold int mxpeg_decode_end(AVCodecContext *avctx)`
`48`	`48`	`{`
`49`	`49`	`MXpegDecodeContext *s = avctx->priv_data;`
`50`		`- MJpegDecodeContext *jpg = &s->jpg;`
`51`	`50`	`int i;`
`52`	`51`
`53`		`- jpg->picture_ptr = NULL;`
`54`	`52`	`ff_mjpeg_decode_end(avctx);`
`55`	`53`
`56`	`54`	`for (i = 0; i < 2; ++i)`