Attachment #261347 for bug #353491

View | Details | Raw Unified | Return to bug 353491
Collapse All | Expand All




                    }
                    ep->Up();
                }
                else if( MKV_IS_ID( el, KaxTagGeneral ) )
                {
                    msg_Dbg( &sys.demuxer, "|   + General" );
                    ep->Down();
                    while( ( el = ep->Get() ) != NULL )
                    {
                        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() );
                    }
                    ep->Up();
                }
                else if( MKV_IS_ID( el, KaxTagGenres ) )
                {
                    msg_Dbg( &sys.demuxer, "|   + Genres" );
                    ep->Down();
                    while( ( el = ep->Get() ) != NULL )
                    {
                        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() );
                    }
                    ep->Up();
                }
                else if( MKV_IS_ID( el, KaxTagAudioSpecific ) )
                {
                    msg_Dbg( &sys.demuxer, "|   + Audio Specific" );
                    ep->Down();
                    while( ( el = ep->Get() ) != NULL )
                    {
                        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() );
                    }
                    ep->Up();
                }
                else if( MKV_IS_ID( el, KaxTagImageSpecific ) )
                {
                    msg_Dbg( &sys.demuxer, "|   + Images Specific" );
                    ep->Down();
                    while( ( el = ep->Get() ) != NULL )
                    {
                        msg_Dbg( &sys.demuxer, "|   |   + Unknown (%s)", typeid( *el ).name() );
                    }
                    ep->Up();
                }
                else if( MKV_IS_ID( el, KaxTagMultiComment ) )
                {
                    msg_Dbg( &sys.demuxer, "|   + Multi Comment" );
                }
                else if( MKV_IS_ID( el, KaxTagMultiCommercial ) )
                {
                    msg_Dbg( &sys.demuxer, "|   + Multi Commercial" );
                }
                else if( MKV_IS_ID( el, KaxTagMultiDate ) )
                {
                    msg_Dbg( &sys.demuxer, "|   + Multi Date" );
                }
                else if( MKV_IS_ID( el, KaxTagMultiEntity ) )
                {
                    msg_Dbg( &sys.demuxer, "|   + Multi Entity" );
                }
                else if( MKV_IS_ID( el, KaxTagMultiIdentifier ) )
                {
                    msg_Dbg( &sys.demuxer, "|   + Multi Identifier" );
                }
                else if( MKV_IS_ID( el, KaxTagMultiLegal ) )
                {
                    msg_Dbg( &sys.demuxer, "|   + Multi Legal" );
                }
                else if( MKV_IS_ID( el, KaxTagMultiTitle ) )
                {
                    msg_Dbg( &sys.demuxer, "|   + Multi Title" );
                }
                else
                {
                    msg_Dbg( &sys.demuxer, "|   + LoadTag Unknown (%s)", typeid( *el ).name() );

Lines 92-98 Link Here

(-)vlc-1.1.7.orig/modules/demux/mkv/mkv.hpp (-1 lines)
92	#include "matroska/KaxSegment.h"	92	#include "matroska/KaxSegment.h"
93	#include "matroska/KaxTag.h"	93	#include "matroska/KaxTag.h"
94	#include "matroska/KaxTags.h"	94	#include "matroska/KaxTags.h"
95	#include "matroska/KaxTagMulti.h"
96	#include "matroska/KaxTracks.h"	95	#include "matroska/KaxTracks.h"
97	#include "matroska/KaxTrackAudio.h"	96	#include "matroska/KaxTrackAudio.h"
98	#include "matroska/KaxTrackVideo.h"	97	#include "matroska/KaxTrackVideo.h"

Return to bug 353491

Lines 220-293 Link Here

(-)vlc-1.1.7.orig/modules/demux/mkv/matroska_segment.cpp (-68 lines)
220	}	220	}
221	ep->Up();	221	ep->Up();
222	}	222	}
223	else if( MKV_IS_ID( el, KaxTagGeneral ) )
224	{
225	msg_Dbg( &sys.demuxer, "\| + General" );
226	ep->Down();
227	while( ( el = ep->Get() ) != NULL )
228	{
229	msg_Dbg( &sys.demuxer, "\| \| + Unknown (%s)", typeid( *el ).name() );
230	}
231	ep->Up();
232	}
233	else if( MKV_IS_ID( el, KaxTagGenres ) )
234	{
235	msg_Dbg( &sys.demuxer, "\| + Genres" );
236	ep->Down();
237	while( ( el = ep->Get() ) != NULL )
238	{
239	msg_Dbg( &sys.demuxer, "\| \| + Unknown (%s)", typeid( *el ).name() );
240	}
241	ep->Up();
242	}
243	else if( MKV_IS_ID( el, KaxTagAudioSpecific ) )
244	{
245	msg_Dbg( &sys.demuxer, "\| + Audio Specific" );
246	ep->Down();
247	while( ( el = ep->Get() ) != NULL )
248	{
249	msg_Dbg( &sys.demuxer, "\| \| + Unknown (%s)", typeid( *el ).name() );
250	}
251	ep->Up();
252	}
253	else if( MKV_IS_ID( el, KaxTagImageSpecific ) )
254	{
255	msg_Dbg( &sys.demuxer, "\| + Images Specific" );
256	ep->Down();
257	while( ( el = ep->Get() ) != NULL )
258	{
259	msg_Dbg( &sys.demuxer, "\| \| + Unknown (%s)", typeid( *el ).name() );
260	}
261	ep->Up();
262	}
263	else if( MKV_IS_ID( el, KaxTagMultiComment ) )
264	{
265	msg_Dbg( &sys.demuxer, "\| + Multi Comment" );
266	}
267	else if( MKV_IS_ID( el, KaxTagMultiCommercial ) )
268	{
269	msg_Dbg( &sys.demuxer, "\| + Multi Commercial" );
270	}
271	else if( MKV_IS_ID( el, KaxTagMultiDate ) )
272	{
273	msg_Dbg( &sys.demuxer, "\| + Multi Date" );
274	}
275	else if( MKV_IS_ID( el, KaxTagMultiEntity ) )
276	{
277	msg_Dbg( &sys.demuxer, "\| + Multi Entity" );
278	}
279	else if( MKV_IS_ID( el, KaxTagMultiIdentifier ) )
280	{
281	msg_Dbg( &sys.demuxer, "\| + Multi Identifier" );
282	}
283	else if( MKV_IS_ID( el, KaxTagMultiLegal ) )
284	{
285	msg_Dbg( &sys.demuxer, "\| + Multi Legal" );
286	}
287	else if( MKV_IS_ID( el, KaxTagMultiTitle ) )
288	{
289	msg_Dbg( &sys.demuxer, "\| + Multi Title" );
290	}
291	else	223	else
292	{	224	{
293	msg_Dbg( &sys.demuxer, "\| + LoadTag Unknown (%s)", typeid( *el ).name() );	225	msg_Dbg( &sys.demuxer, "\| + LoadTag Unknown (%s)", typeid( *el ).name() );