OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a67816b
)
avcodec/mpeg12dec: Do not choke on extra m704 alpha data
author
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 30 Apr 2016 23:25:20 +0000
(
01:25
+0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 30 Apr 2016 23:43:06 +0000
(
01:43
+0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/mpeg12dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpeg12dec.c
b/libavcodec/mpeg12dec.c
index
f6089e4
..
4c96a1a
100644
(file)
--- a/
libavcodec/mpeg12dec.c
+++ b/
libavcodec/mpeg12dec.c
@@
-1896,6
+1896,10
@@
static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
av_log(avctx, AV_LOG_DEBUG, "Invalid MXF data found in video stream\n");
is_d10 = 1;
}
+ if (left > 32 && show_bits_long(&gb, 32) == 0x201) {
+ av_log(avctx, AV_LOG_DEBUG, "skipping m704 alpha (unsupported)\n");
+ goto eos;
+ }
}
if (left < 0 ||