From 09317e3e06d7126337c2311ecf8bb7762369c110 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Fri, 9 Sep 2016 08:05:20 -0700 Subject: ivfenc: Add VPX codec tags. This fixes remuxing VPX from MP4 without manually overwriting the tag. --- libavformat/ivfenc.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libavformat') diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c index 5dbcd97611..f3ae4dca66 100644 --- a/libavformat/ivfenc.c +++ b/libavformat/ivfenc.c @@ -97,6 +97,12 @@ static int ivf_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt) return ret; } +static const AVCodecTag codec_ivf_tags[] = { + { AV_CODEC_ID_VP8, MKTAG('V', 'P', '8', '0') }, + { AV_CODEC_ID_VP9, MKTAG('V', 'P', '9', '0') }, + { AV_CODEC_ID_NONE, 0 } +}; + AVOutputFormat ff_ivf_muxer = { .priv_data_size = sizeof(IVFEncContext), .name = "ivf", @@ -108,4 +114,5 @@ AVOutputFormat ff_ivf_muxer = { .write_packet = ivf_write_packet, .write_trailer = ivf_write_trailer, .check_bitstream = ivf_check_bitstream, + .codec_tag = (const AVCodecTag* const []){ codec_ivf_tags, 0 }, }; -- cgit v1.2.3