From 9cc1ab63ac0fa524ad9b6c8ef600dc4fc69e2b31 Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Fri, 6 May 2016 16:20:13 +0200 Subject: [PATCH] h2645_parse: allow partial escaping This ports the fix from 033a533 to the new parser module in prepartion of using it for the h264 decoder. Signed-off-by: Derek Buitenhuis --- libavcodec/h2645_parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index 496cd8d54e..aac9f99940 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -38,7 +38,7 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length, nal->skipped_bytes = 0; #define STARTCODE_TEST \ if (i + 2 < length && src[i + 1] == 0 && src[i + 2] <= 3) { \ - if (src[i + 2] != 3) { \ + if (src[i + 2] != 3 && src[i + 2] != 0) { \ /* startcode, so we must be past the end */ \ length = i; \ } \ @@ -103,7 +103,7 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length, if (src[si + 2] > 3) { dst[di++] = src[si++]; dst[di++] = src[si++]; - } else if (src[si] == 0 && src[si + 1] == 0) { + } else if (src[si] == 0 && src[si + 1] == 0 && src[si + 2] != 0) { if (src[si + 2] == 3) { // escape dst[di++] = 0; dst[di++] = 0; -- 2.11.0