hopefully fixing sprite_warping_points==0

Originally committed as revision 1136 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 22 years ago
parent b401ebad91
commit f56dd362bd
  1. 6
      libavcodec/h263.c

@ -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){
} }
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");
} }

Loading…
Cancel
Save