diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 15:12:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 15:12:45 +0200 |
| commit | 47c8d1e174b8677bb3c9f6e2ce0c37907b3a8886 (patch) | |
| tree | cc56967569d011c46428299dd52a98bc55dada3d | |
| parent | 08c5859f17ed6c16d7e59ea63c63d85cc0d9427f (diff) | |
| parent | b2290bf10b12b7772f55fcab014a47e18e9fdef2 (diff) | |
| download | ffmpeg-47c8d1e174b8677bb3c9f6e2ce0c37907b3a8886.tar.gz | |
Merge commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2'
* commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2':
i263: skip dummy frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/intelh263dec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index 7ea62465fa..5ed1cdba72 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"); |