aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrcombs <rcombs@rcombs.me>2022-04-16 02:47:30 -0500
committerrcombs <rcombs@rcombs.me>2022-06-01 19:38:50 -0500
commit686b64e15526fbc1410104212aa291b66b0f488e (patch)
tree40a4c11ef728d4c4ee71c9ffce6d9f588c75130e
parentdfbc921f9f6b940c7de48f7795f20fcd553e792a (diff)
downloadffmpeg-686b64e15526fbc1410104212aa291b66b0f488e.tar.gz
lavc/videotoolboxdec: fix escaping sequential zero sequences
This ensure that e.g. 0000000000 becomes 00000300 000300, rather than 00000300 0000. Signed-off-by: rcombs <rcombs@rcombs.me>
-rw-r--r--libavcodec/videotoolbox.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
index 7c4c4c6e1b..a1933f03f2 100644
--- a/libavcodec/videotoolbox.c
+++ b/libavcodec/videotoolbox.c
@@ -166,14 +166,13 @@ static int escape_ps(uint8_t* dst, const uint8_t* src, int src_size)
src[i + 2] <= 0x03) {
if (dst) {
*p++ = src[i++];
- *p++ = src[i++];
+ *p++ = src[i];
*p++ = 0x03;
} else {
- i += 2;
+ i++;
}
size++;
- }
- if (dst)
+ } else if (dst)
*p++ = src[i];
}