Merge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf'

* commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf':
  screenpresso: Correctly handle keyframes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-05-08 23:43:51 +01:00
commit 483e9d8a2b

View File

@ -115,10 +115,9 @@ static int screenpresso_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
/* Basic sanity check, but not really harmful */ /* Compression level (4 bits) and keyframe information (1 bit) */
if (avpkt->data[0] != 0x73 && avpkt->data[0] != 0x72) av_log(avctx, AV_LOG_DEBUG, "Compression level %d\n", avpkt->data[0] >> 4);
av_log(avctx, AV_LOG_WARNING, "Unknown header 0x%02X\n", avpkt->data[0]); keyframe = avpkt->data[0] & 1;
keyframe = (avpkt->data[0] == 0x73);
/* Pixel size */ /* Pixel size */
component_size = ((avpkt->data[1] >> 2) & 0x03) + 1; component_size = ((avpkt->data[1] >> 2) & 0x03) + 1;