[FFmpeg-cvslog] av1_parse: Don't reject zero-size padding OBUs
Mark Thompson
git at videolan.org
Wed May 17 23:48:46 EEST 2023
ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Tue Jan 24 22:46:23 2023 +0000| [84505310594e61a9eba3a4abbfc00b882db33a08] | committer: Mark Thompson
av1_parse: Don't reject zero-size padding OBUs
Padding OBUs are not required to be nonempty.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=84505310594e61a9eba3a4abbfc00b882db33a08
---
libavcodec/av1_parse.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/av1_parse.c b/libavcodec/av1_parse.c
index 948e8eb62a..061636815f 100644
--- a/libavcodec/av1_parse.c
+++ b/libavcodec/av1_parse.c
@@ -88,7 +88,9 @@ int ff_av1_packet_split(AV1Packet *pkt, const uint8_t *buf, int length, void *lo
obu->size_bits = get_obu_bit_length(obu->data, obu->size, obu->type);
- if (obu->size_bits < 0 || (!obu->size_bits && obu->type != AV1_OBU_TEMPORAL_DELIMITER)) {
+ if (obu->size_bits < 0 ||
+ (obu->size_bits == 0 && (obu->type != AV1_OBU_TEMPORAL_DELIMITER &&
+ obu->type != AV1_OBU_PADDING))) {
av_log(logctx, AV_LOG_ERROR, "Invalid OBU of type %d, skipping.\n", obu->type);
continue;
}
More information about the ffmpeg-cvslog
mailing list