Commit dd1f30a7 authored by michael's avatar michael

recommit of

VOL != 0x120 support


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2355 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent b5ce0e16
...@@ -5164,21 +5164,18 @@ int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb) ...@@ -5164,21 +5164,18 @@ int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb)
printf(" at %d\n", get_bits_count(gb)); printf(" at %d\n", get_bits_count(gb));
} }
switch(startcode){ if(startcode >= 0x120 && startcode <= 0x12F){
case 0x120:
if(decode_vol_header(s, gb) < 0) if(decode_vol_header(s, gb) < 0)
return -1; return -1;
break; }
case USER_DATA_STARTCODE: else if(startcode == USER_DATA_STARTCODE){
decode_user_data(s, gb); decode_user_data(s, gb);
break; }
case GOP_STARTCODE: else if(startcode == GOP_STARTCODE){
mpeg4_decode_gop_header(s, gb); mpeg4_decode_gop_header(s, gb);
break; }
case VOP_STARTCODE: else if(startcode == VOP_STARTCODE){
return decode_vop_header(s, gb); return decode_vop_header(s, gb);
default:
break;
} }
align_get_bits(gb); align_get_bits(gb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment