[SCM] libav/experimental: recommit of VOL != 0x120 support

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 11417deff95445a48a5696dc73823e906c62df47
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Oct 11 08:27:07 2003 +0000

    recommit of
    VOL != 0x120 support
    
    Originally committed as revision 2355 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index ec6aaff..06b70d0 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -5164,21 +5164,18 @@ int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb)
             printf(" at %d\n", get_bits_count(gb));
         }
 
-        switch(startcode){
-        case 0x120:
+        if(startcode >= 0x120 && startcode <= 0x12F){
             if(decode_vol_header(s, gb) < 0) 
                 return -1;
-            break;
-        case USER_DATA_STARTCODE:
+        }
+        else if(startcode == USER_DATA_STARTCODE){
             decode_user_data(s, gb);
-            break;
-        case GOP_STARTCODE:
+        }
+        else if(startcode == GOP_STARTCODE){
             mpeg4_decode_gop_header(s, gb);
-            break;
-        case VOP_STARTCODE:
+        }
+        else if(startcode == VOP_STARTCODE){
             return decode_vop_header(s, gb);
-        default:
-            break;
         }
 
         align_get_bits(gb);

-- 
Libav/FFmpeg packaging