[FFmpeg-cvslog] avformat/dvdvideodec: move memcpy below missed NAV packet warning

Marth64 git at videolan.org
Sat Nov 16 22:48:35 EET 2024


ffmpeg | branch: master | Marth64 <marth64 at proxyid.net> | Mon Oct  7 18:04:53 2024 -0500| [6bbaa7db49de86653bd23544e5bb55315265f828] | committer: Marth64

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 <marth64 at proxyid.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=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;



More information about the ffmpeg-cvslog mailing list