From b108d17c5659f5cd78a0de61da9306c225f4bc50 Mon Sep 17 00:00:00 2001 From: Marth64 Date: Mon, 7 Oct 2024 18:04:53 -0500 Subject: [PATCH] avformat/dvdvideodec: move memcpy below missed NAV packet warning Readability improvement; the warning can be bundled beneath the preceding validations rather than awkwardly between the memcpy and return. Signed-off-by: Marth64 (cherry picked from commit 6bbaa7db49de86653bd23544e5bb55315265f828) --- libavformat/dvdvideodec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c index bed7c38ff6..9246ac0863 100644 --- a/libavformat/dvdvideodec.c +++ b/libavformat/dvdvideodec.c @@ -804,13 +804,13 @@ static int dvdvideo_play_next_ps_block(AVFormatContext *s, DVDVideoPlaybackState return AVERROR_INPUT_CHANGED; } - memcpy(buf, &nav_buf, nav_len); - if (state->pgn != cur_pgn) av_log(s, AV_LOG_WARNING, "Unexpected PG change (expected=%d actual=%d); " "this could be due to a missed NAV packet\n", state->pgn, cur_pgn); + memcpy(buf, &nav_buf, nav_len); + (*p_nav_event) = nav_event; state->is_seeking = 0;