highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'a643a47d41f4924b66fce339e4b82aaee20825be' into release/2.2

Browse Source 
* commit 'a643a47d41f4924b66fce339e4b82aaee20825be':
  fic: Properly handle skip frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-11 11:03:01 +01:00
parent 27e6b4a3ff a643a47d41
commit bc3648d4b4
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/fic.c
View File

@@ -166,6 +166,10 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data,
if (memcmp(src, fic_header, 7)) if (memcmp(src, fic_header, 7))
av_log(avctx, AV_LOG_WARNING, "Invalid FIC Header.\n"); av_log(avctx, AV_LOG_WARNING, "Invalid FIC Header.\n");
/* Is it a skip frame? */
if (src[17])
goto skip;
nslices = src[13]; nslices = src[13];
if (!nslices) { if (!nslices) {
av_log(avctx, AV_LOG_ERROR, "Zero slices found.\n"); av_log(avctx, AV_LOG_ERROR, "Zero slices found.\n");
@@ -246,6 +250,7 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data,
NULL, nslices, sizeof(ctx->slice_data[0])) < 0) NULL, nslices, sizeof(ctx->slice_data[0])) < 0)
return ret; return ret;
skip:
*got_frame = 1; *got_frame = 1;
if ((ret = av_frame_ref(data, ctx->frame)) < 0) if ((ret = av_frame_ref(data, ctx->frame)) < 0)
return ret; return ret;