wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lavc/mjpegdec: avoid unneeded allocation if the frame is to be skipped

Browse source
This commit is contained in:
Matthieu Bouron 2016-03-01 18:15:48 +01:00
parent bba9bed3f3
commit 81f14884b5
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libavcodec/mjpegdec.c
View file

@ -614,6 +614,13 @@ unk_pixfmt:
return AVERROR_BUG;
}
if (s->avctx->skip_frame == AVDISCARD_ALL) {
s->picture_ptr->pict_type = AV_PICTURE_TYPE_I;
s->picture_ptr->key_frame = 1;
s->got_picture = 1;
return 0;
}
av_frame_unref(s->picture_ptr);
if (ff_get_buffer(s->avctx, s->picture_ptr, AV_GET_BUFFER_FLAG_REF) < 0)
return -1;