[vlc-commits] demux: ogg: fix oggds header check

Francois Cartegnie git at videolan.org
Fri May 25 11:10:38 CEST 2018


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed May 23 12:17:58 2018 +0200| [4b206fc0989a2d9d5acdcb166bc426a1e9cd9f04] | committer: Francois Cartegnie

demux: ogg: fix oggds header check

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4b206fc0989a2d9d5acdcb166bc426a1e9cd9f04
---

 modules/demux/ogg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 7b03bd542d..4bee1a31ae 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -1027,7 +1027,8 @@ static void Ogg_UpdatePCR( demux_t *p_demux, logical_stream_t *p_stream,
     {
         /* We're in headers, and we haven't parsed 1st data packet yet */
 //        p_stream->i_pcr = VLC_TS_UNKNOWN;
-        if( p_stream->b_oggds && ogg_page_packets( p_oggpacket ) )
+        if( p_stream->b_oggds && p_oggpacket->bytes > 0 &&
+            (p_oggpacket->packet[0] & PACKET_TYPE_HEADER) == 0 )
         {
             p_stream->i_pcr = VLC_TS_0 + p_ogg->i_nzpcr_offset;
         }



More information about the vlc-commits mailing list