diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 23:43:51 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 23:43:55 +0100 |
| commit | 483e9d8a2bb46ffaff8c41af7a7be01ebd7458df (patch) | |
| tree | 5f5d0d243776aa8567fa7d7ba4814d17066ed4cd /libavcodec/screenpresso.c | |
| parent | 5d31074daf0e448a636fbb0436f04ed54c20eab1 (diff) | |
| parent | ec8a69fab657f9cce624e8b0f4069d12696890bf (diff) | |
| download | ffmpeg-483e9d8a2bb46ffaff8c41af7a7be01ebd7458df.tar.gz | |
Merge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf'
* commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf':
screenpresso: Correctly handle keyframes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/screenpresso.c')
| -rw-r--r-- | libavcodec/screenpresso.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/screenpresso.c b/libavcodec/screenpresso.c index 67d4ebb251..15334a191f 100644 --- a/libavcodec/screenpresso.c +++ b/libavcodec/screenpresso.c @@ -115,10 +115,9 @@ static int screenpresso_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - /* Basic sanity check, but not really harmful */ - if (avpkt->data[0] != 0x73 && avpkt->data[0] != 0x72) - av_log(avctx, AV_LOG_WARNING, "Unknown header 0x%02X\n", avpkt->data[0]); - keyframe = (avpkt->data[0] == 0x73); + /* Compression level (4 bits) and keyframe information (1 bit) */ + av_log(avctx, AV_LOG_DEBUG, "Compression level %d\n", avpkt->data[0] >> 4); + keyframe = avpkt->data[0] & 1; /* Pixel size */ component_size = ((avpkt->data[1] >> 2) & 0x03) + 1; |