vc1dec.c (libav-12) | : | vc1dec.c (libav-12.1) | ||
---|---|---|---|---|
skipping to change at line 272 | skipping to change at line 272 | |||
} | } | |||
static int vc1_decode_sprites(VC1Context *v, GetBitContext* gb) | static int vc1_decode_sprites(VC1Context *v, GetBitContext* gb) | |||
{ | { | |||
MpegEncContext *s = &v->s; | MpegEncContext *s = &v->s; | |||
AVCodecContext *avctx = s->avctx; | AVCodecContext *avctx = s->avctx; | |||
SpriteData sd; | SpriteData sd; | |||
vc1_parse_sprites(v, gb, &sd); | vc1_parse_sprites(v, gb, &sd); | |||
if (!s->current_picture.f->data[0]) { | if (!s->current_picture.f || !s->current_picture.f->data[0]) { | |||
av_log(avctx, AV_LOG_ERROR, "Got no sprites\n"); | av_log(avctx, AV_LOG_ERROR, "Got no sprites\n"); | |||
return -1; | return -1; | |||
} | } | |||
if (v->two_sprites && (!s->last_picture_ptr || !s->last_picture.f->data[0])) { | if (v->two_sprites && (!s->last_picture_ptr || !s->last_picture.f->data[0])) { | |||
av_log(avctx, AV_LOG_WARNING, "Need two sprites, only got one\n"); | av_log(avctx, AV_LOG_WARNING, "Need two sprites, only got one\n"); | |||
v->two_sprites = 0; | v->two_sprites = 0; | |||
} | } | |||
av_frame_unref(v->sprite_output_frame); | av_frame_unref(v->sprite_output_frame); | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |