summaryrefslogtreecommitdiff
path: root/libavcodec/fic.c
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2014-03-07 14:31:53 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2014-03-07 14:54:33 +0000
commitf87a6e500bcdaede22a123b81a2a46779cf7b71a (patch)
treec95a4bbc6fc8fb722f80f5c74033045b3d59cbd5 /libavcodec/fic.c
parentf69befe5eefef12172a6479dd9cef3c01bddec7a (diff)
fic: Properly handle skip frames
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/fic.c')
-rw-r--r--libavcodec/fic.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/fic.c b/libavcodec/fic.c
index 9a3bc3eb9c..df034371e0 100644
--- a/libavcodec/fic.c
+++ b/libavcodec/fic.c
@@ -166,6 +166,10 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data,
if (memcmp(src, fic_header, 7))
av_log(avctx, AV_LOG_WARNING, "Invalid FIC Header.\n");
+ /* Is it a skip frame? */
+ if (src[17])
+ goto skip;
+
nslices = src[13];
if (!nslices) {
av_log(avctx, AV_LOG_ERROR, "Zero slices found.\n");
@@ -245,6 +249,7 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data,
NULL, nslices, sizeof(ctx->slice_data[0])) < 0)
return ret;
+skip:
*got_frame = 1;
if ((ret = av_frame_ref(data, ctx->frame)) < 0)
return ret;