diff options
| author | Alex Converse <alex.converse@gmail.com> | 2016-09-09 08:05:20 -0700 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2016-09-10 16:40:47 -0700 |
| commit | 09317e3e06d7126337c2311ecf8bb7762369c110 (patch) | |
| tree | 94f8cf822134c8c7d673b3247ce5fe173b762d02 /libavformat/ivfenc.c | |
| parent | 97297fb1446f3d5713b4258fa24ccaff3f4f932b (diff) | |
| download | ffmpeg-09317e3e06d7126337c2311ecf8bb7762369c110.tar.gz | |
ivfenc: Add VPX codec tags.
This fixes remuxing VPX from MP4 without manually overwriting the tag.
Diffstat (limited to 'libavformat/ivfenc.c')
| -rw-r--r-- | libavformat/ivfenc.c | 7 |
1 files changed, 7 insertions, 0 deletions
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 }, }; |