summaryrefslogtreecommitdiff
path: root/libavformat/matroskadec.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2018-01-13 16:04:21 -0300
committerJames Almer <jamrial@gmail.com>2018-02-19 22:13:13 -0300
commitacdea9e7c56b74b05c56b4733acc855b959ba073 (patch)
tree56cc1a8bf534f4bd0d582d01bdec3ce1b1bebd6a /libavformat/matroskadec.c
parentb50f68bb1ecc6dcfe7aaed04c12dd94bdc222428 (diff)
avformat/matroskadec: ignore CodecPrivate if the stream is VP9
Defined in a recent revision of https://www.webmproject.org/docs/container/ This prevents storing the contents of CodecPrivate into extradata for a codec that doesn't need nor expect any. It will among other things prevent matroska specific binary data from being dumped onto other formats during remuxing. 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 cda8df2213..edc4f5d476 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2397,6 +2397,10 @@ static int matroska_parse_tracks(AVFormatContext *s)
return ret;
} else if (codec_id == AV_CODEC_ID_PRORES && track->codec_priv.size == 4) {
fourcc = AV_RL32(track->codec_priv.data);
+ } else if (codec_id == AV_CODEC_ID_VP9 && track->codec_priv.size) {
+ /* we don't need any value stored in CodecPrivate.
+ make sure that it's not exported as extradata. */
+ track->codec_priv.size = 0;
}
track->codec_priv.size -= extradata_offset;