summaryrefslogtreecommitdiff
path: root/libavformat/matroskadec.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2018-08-16 18:01:44 -0300
committerJames Almer <jamrial@gmail.com>2018-08-17 15:09:02 -0300
commit8d5604a69aaa5e9ce6e930fcae6bab7e3f016841 (patch)
treea4dcac0703588c00d2f3972940f3872bb515dfe3 /libavformat/matroskadec.c
parent96a7099f3ed57aa6dd8de2e727e25a4508743bd8 (diff)
avformat/av1: update ff_isom_write_av1c() to the latest revision of the spec
This will get ISOBMFF and Matroska up to date with the revised AV1 Codec Configuration Box spec. For now keep propagating raw OBUs as extradata until all libavcodec modules are adapted to handle AV1CodecConfigurationRecord formatted extradata. Tested-by: Thomas Daede <bztdlinux@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/matroskadec.c')
-rw-r--r--libavformat/matroskadec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 1ded431b80..e6793988e1 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2421,6 +2421,10 @@ static int matroska_parse_tracks(AVFormatContext *s)
/* we don't need any value stored in CodecPrivate.
make sure that it's not exported as extradata. */
track->codec_priv.size = 0;
+ } else if (codec_id == AV_CODEC_ID_AV1 && track->codec_priv.size) {
+ /* For now, propagate only the OBUs, if any. Once libavcodec is
+ updated to handle isobmff style extradata this can be removed. */
+ extradata_offset = 4;
}
track->codec_priv.size -= extradata_offset;