[vlc-devel] [PATCH] Disable dirac demuxing support in ogg

[David Flynn]

From: David Flynn <davidf at rd.bbc.co.uk>

The creators of Dirac are currently discussing a revision to the
ogg mapping spec with Xiph.  Until it is finalised, it would be
better not to support ogg-dirac in the 0.9.0 release.

If the situation changes before the 0.9.0 release, the demuxer
will need updating and this patch reverting.

Signed-off-by: David Flynn <davidf at rd.bbc.co.uk>
---
 modules/demux/ogg.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 46ff4d9..33d19b9 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -897,6 +897,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
                              "found theora header, bitrate: %i, rate: %f",
                              p_stream->fmt.i_bitrate, p_stream->f_rate );
                 }
+#if 0
                 /* Check for Dirac header */
                 else if( oggpacket.bytes >= 5 &&
                          ! memcmp( oggpacket.packet, "BBCD\x00", 5 ) )
@@ -904,6 +905,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
                     Ogg_ReadDiracHeader( p_stream, &oggpacket );
                     msg_Dbg( p_demux, "found dirac header" );
                 }
+#endif
                 /* Check for Tarkin header */
                 else if( oggpacket.bytes >= 7 &&
                          ! memcmp( &oggpacket.packet[1], "tarkin", 6 ) )
-- 
1.5.6