Changeset 450306de15587bcde1f7ef99d996cc4a0aac6e16

Timestamp:

17/11/07 09:47:24 (1 year ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1195289244 +0000

git-parent:

[195f75696698ee5aefd877dbc9a9cbd8dee0ee3c]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1195289244 +0000

Message:

Extra Data code factorisation: This shouldn't destroy old support, but please repport any broken stream.

Files:

• modules/demux/real.c (modified) (3 diffs)

modules/demux/real.c

@@ -1122 +1122 @@
-            p_peek += 3;                                               /* ?? */
-            if( i_version == 5 ) p_peek++;
+            /* Extra Data then: DWord + byte[] */
+            fmt.i_extra = GetDWBE( p_peek ); p_peek += 4;
-        }
-
@@ -1141 +1143 @@
-        case VLC_FOURCC( 'r','a','a','c' ):
-        case VLC_FOURCC( 'r','a','c','p' ):
-            fmt.i_extra = GetDWBE( p_peek ); p_peek += 4;
-            // For version == 4, there might need an extra p_peek++
-            if( fmt.i_extra > 0 ) { fmt.i_extra--; p_peek++; }
-            if( fmt.i_extra > 0 )
@@ -1156 +1156 @@
-        case VLC_FOURCC('a','t','r','c'):
-            fmt.audio.i_blockalign = i_subpacket_size;
-(fmt.i_extra = GetDWBE( p_peek ))
+fmt.i_extra
-            fmt.p_extra = malloc( fmt.i_extra );
- + 4
+
-            break;
-