summaryrefslogtreecommitdiff
path: root/libavcodec/intelh263dec.c
diff options
context:
space:
mode:
authorDirk Ausserhaus <dausserhaus@gmail.com>2014-06-18 10:01:52 +0200
committerKostya Shishkov <kostya.shishkov@gmail.com>2014-06-19 13:13:20 +0200
commitb2290bf10b12b7772f55fcab014a47e18e9fdef2 (patch)
tree4296c23904d85ef76325b73562e8cdfedbeb3dbd /libavcodec/intelh263dec.c
parente74433a8e6fc00c8dbde293c97a3e45384c2c1d9 (diff)
downloadffmpeg-b2290bf10b12b7772f55fcab014a47e18e9fdef2.tar.gz
i263: skip dummy frames
Intel i263 codec has special 8-byte dummy frames that should not be decoded, so do not even attempt to decode them and skip them instead. Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Diffstat (limited to 'libavcodec/intelh263dec.c')
-rw-r--r--libavcodec/intelh263dec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c
index 8a0a381fb7..e34da5c6f5 100644
--- a/libavcodec/intelh263dec.c
+++ b/libavcodec/intelh263dec.c
@@ -26,6 +26,10 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
{
int format;
+ if (get_bits_left(&s->gb) == 64) { /* special dummy frames */
+ return FRAME_SKIPPED;
+ }
+
/* picture header */
if (get_bits_long(&s->gb, 22) != 0x20) {
av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n");