From: rcombs <rco...@rcombs.me>
Fixes decoding of files with sync-fooling sequences in their PSs.
Signed-off-by: rcombs <rco...@rcombs.me>
---
libavcodec/videotoolbox.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
index 921fed9619..ce83c2594a 100644
--- a/libavcodec/videotoolbox.c
+++ b/libavcodec/videotoolbox.c
@@ -246,7 +246,7 @@ CFDataRef
ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx)
for (i = 0; i < HEVC_MAX_##T##PS_COUNT; i++) { \
if (h->ps.t##ps_list[i]) { \
const HEVC##T##PS *lps = (const HEVC##T##PS
*)h->ps.t##ps_list[i]->data; \
- vt_extradata_size += 2 + lps->data_size; \
+ vt_extradata_size += 2 + escape_ps(NULL, lps->data,
lps->data_size); \
num_##t##ps++; \
} \
}
@@ -369,11 +369,11 @@ CFDataRef
ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx)
for (i = 0; i < HEVC_MAX_##T##PS_COUNT; i++) { \
if (h->ps.t##ps_list[i]) { \
const HEVC##T##PS *lps = (const HEVC##T##PS
*)h->ps.t##ps_list[i]->data; \
+ int size = escape_ps(p + 2, lps->data, lps->data_size); \
/* unsigned int(16) nalUnitLength; */ \
- AV_WB16(p, lps->data_size); \
+ AV_WB16(p, size); \
/* bit(8*nalUnitLength) nalUnit; */ \
- memcpy(p + 2, lps->data, lps->data_size); \
- p += 2 + lps->data_size; \
+ p += 2 + size; \
} \
}
--
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
