Commit 9b9b60d7 authored by michaelni's avatar michaelni

hopefully fixing sprite_warping_points==0


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1136 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 016ab99e
...@@ -2321,7 +2321,7 @@ static int mpeg4_decode_video_packet_header(MpegEncContext *s) ...@@ -2321,7 +2321,7 @@ static int mpeg4_decode_video_packet_header(MpegEncContext *s)
if(s->shape != BIN_ONLY_SHAPE){ if(s->shape != BIN_ONLY_SHAPE){
skip_bits(&s->gb, 3); /* intra dc vlc threshold */ skip_bits(&s->gb, 3); /* intra dc vlc threshold */
//FIXME dont just ignore everything //FIXME dont just ignore everything
if(s->pict_type == S_TYPE && s->vol_sprite_usage==GMC_SPRITE && s->num_sprite_warping_points){ if(s->pict_type == S_TYPE && s->vol_sprite_usage==GMC_SPRITE){
mpeg4_decode_sprite_trajectory(s); mpeg4_decode_sprite_trajectory(s);
fprintf(stderr, "untested\n"); fprintf(stderr, "untested\n");
} }
...@@ -4485,9 +4485,7 @@ static int decode_vop_header(MpegEncContext *s, GetBitContext *gb){ ...@@ -4485,9 +4485,7 @@ static int decode_vop_header(MpegEncContext *s, GetBitContext *gb){
} }
if(s->pict_type == S_TYPE && (s->vol_sprite_usage==STATIC_SPRITE || s->vol_sprite_usage==GMC_SPRITE)){ if(s->pict_type == S_TYPE && (s->vol_sprite_usage==STATIC_SPRITE || s->vol_sprite_usage==GMC_SPRITE)){
if(s->num_sprite_warping_points){ mpeg4_decode_sprite_trajectory(s);
mpeg4_decode_sprite_trajectory(s);
}
if(s->sprite_brightness_change) printf("sprite_brightness_change not supported\n"); if(s->sprite_brightness_change) printf("sprite_brightness_change not supported\n");
if(s->vol_sprite_usage==STATIC_SPRITE) printf("static sprite not supported\n"); if(s->vol_sprite_usage==STATIC_SPRITE) printf("static sprite not supported\n");
} }
......
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