[FFmpeg-devel] [PATCH 6/7] avcodec/mpegvideo: Remove always-false check

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Wed Oct 26 05:01:47 EEST 2022

This basically reverts cc0380222add8df8ff9b3bd95eaf2b9d8c4c0d11.
At the time of said commit, cleanup on init failure was very
buggy. For codecs with the INIT_CLEANUP cap, the close function
could be called on error even before the private data has been
allocated; and when using frame threading the same could also
happen even without said flag. Some mpegvideo decoders were
affected by the latter.

Yet both of these issues have been fixed long ago, the latter
in commit e9b66175793e5c2af19beefe8e143f6e4901b5df. Therefore
the workaround in ff_mpv_common_end() can be removed.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
 libavcodec/mpegvideo.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index a04d519ccc..99b2d8f6de 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -789,9 +789,6 @@ void ff_mpv_free_context_frame(MpegEncContext *s)
 /* init common structure for both encoder and decoder */
 void ff_mpv_common_end(MpegEncContext *s)
-    if (!s)
-        return;
     if (s->slice_context_count > 1)
         s->slice_context_count = 1;

More information about the ffmpeg-devel mailing list