git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f69befe
)
fic: Properly handle skip frames
author
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Fri, 7 Mar 2014 14:31:53 +0000
(14:31 +0000)
committer
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Fri, 7 Mar 2014 14:54:33 +0000
(14:54 +0000)
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/fic.c
patch
|
blob
|
history
diff --git
a/libavcodec/fic.c
b/libavcodec/fic.c
index
9a3bc3e
..
df03437
100644
(file)
--- 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;