A DVDNAV_WAIT event by itself should not warrant an
EOF when navigating the program stream. Some discs
have WAIT events in the middle of a title, causing
playback to end prematurely prior to this fix.
Signed-off-by: Marth64 <mart...@proxyid.net>
---
libavformat/dvdvideodec.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c
index c94e7f7fe6..8326595e1b 100644
--- a/libavformat/dvdvideodec.c
+++ b/libavformat/dvdvideodec.c
@@ -814,8 +814,15 @@ static int dvdvideo_play_next_ps_block(AVFormatContext *s,
DVDVideoPlaybackState
(*p_nav_event) = nav_event;
return nav_len;
- case DVDNAV_STILL_FRAME:
case DVDNAV_WAIT:
+ if (dvdnav_wait_skip(state->dvdnav) != DVDNAV_STATUS_OK) {
+ av_log(s, AV_LOG_ERROR, "Unable to skip WAIT event\n");
+
+ goto end_dvdnav_error;
+ }
+
+ continue;
+ case DVDNAV_STILL_FRAME:
case DVDNAV_HOP_CHANNEL:
case DVDNAV_HIGHLIGHT:
if (state->in_ps)
@@ -829,14 +836,6 @@ static int dvdvideo_play_next_ps_block(AVFormatContext *s,
DVDVideoPlaybackState
}
}
- if (nav_event == DVDNAV_WAIT) {
- if (dvdnav_wait_skip(state->dvdnav) != DVDNAV_STATUS_OK) {
- av_log(s, AV_LOG_ERROR, "Unable to skip WAIT event\n");
-
- goto end_dvdnav_error;
- }
- }
-
continue;
default:
continue;
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
