Changeset b1e8912f30d256bf83bce9d3c8a8c5f0d5d8625c

Timestamp:

03/01/04 23:35:55 (5 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1078180555 +0000

git-parent:

[ab3260f055c911276a5bfc76ad2d1ca01fda235e]

git-author:

Laurent Aimar <fenrir@videolan.org> 1078180555 +0000

Message:

• video.c: make SVQ3/ffmpeg happy with complex stsd atom (ie with more
  than just the "SMI " one).
  

Files:

• modules/codec/ffmpeg/video.c (modified) (2 diffs)

modules/codec/ffmpeg/video.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-7 2004/02/25 17:48:52
+8 2004/03/01 22:35:55
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -294 +294 @@
-            memset( &p[4], 0, 8 );
-            memcpy( &p[12], p_dec->fmt_in.p_extra, i_size );
+
+            /* Now remove all atoms before the SMI one */
+            if( p_sys->p_context->extradata_size > 0x5a && strncmp( &p[0x56], "SMI ", 4 ) )
+            {
+                uint8_t *psz = &p[0x52];
+
+                while( psz < &p[p_sys->p_context->extradata_size - 8] )
+                {
+                    int i_size = GetDWBE( psz );
+                    if( i_size <= 1 )
+                    {
+                        /* FIXME handle 1 as long size */
+                        break;
+                    }
+                    if( !strncmp( &psz[4], "SMI ", 4 ) )
+                    {
+                        memmove( &p[0x52], psz, &p[p_sys->p_context->extradata_size] - psz );
+                        break;
+                    }
+
+                    psz += i_size;
+                }
+            }
-        }
-        else if( p_dec->fmt_in.i_codec == VLC_FOURCC( 'R', 'V', '1', '0' ) ||