1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2'

* commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2':
  i263: skip dummy frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-19 15:12:22 +02:00
commit 47c8d1e174

View File

@ -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");