aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h263.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-11-01 13:25:22 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-11-01 13:25:22 +0000
commitf56dd362bdb24008ec13406e8baffe62cbe4abd8 (patch)
tree10f9945913ad248d3133230fe5d582fc4aa29e81 /libavcodec/h263.c
parentb401ebad91ea78a263440c966c7da8758b05edfa (diff)
downloadffmpeg-f56dd362bdb24008ec13406e8baffe62cbe4abd8.tar.gz
hopefully fixing sprite_warping_points==0
Originally committed as revision 1136 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263.c')
-rw-r--r--libavcodec/h263.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 78748af146..2c8b1ece32 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -2321,7 +2321,7 @@ static int mpeg4_decode_video_packet_header(MpegEncContext *s)
if(s->shape != BIN_ONLY_SHAPE){
skip_bits(&s->gb, 3); /* intra dc vlc threshold */
//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);
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->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->vol_sprite_usage==STATIC_SPRITE) printf("static sprite not supported\n");
}