[FFmpeg-cvslog] Merge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun May  8 23:43:51 2016 +0100| [483e9d8a2bb46ffaff8c41af7a7be01ebd7458df] | committer: Derek Buitenhuis

Merge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf'

* commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf':
  screenpresso: Correctly handle keyframes

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=483e9d8a2bb46ffaff8c41af7a7be01ebd7458df
---

 libavcodec/screenpresso.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavcodec/screenpresso.c b/libavcodec/screenpresso.c
index 67d4ebb..15334a1 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;


======================================================================