X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fnut.c;h=47ed15252921b643fb0d68d39523bc96b9a94dd9;hb=3a3e8c35b63a40c4d59161097dc8652c15d13779;hp=e65f42438bfad2b54d5fb2ee22e4a9c736312767;hpb=aebc5b2284db1f40a5b3e2e9a2bf406f606436c7;p=ffmpeg diff --git a/libavformat/nut.c b/libavformat/nut.c index e65f42438bf..47ed1525292 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -27,6 +27,8 @@ const AVCodecTag ff_nut_subtitle_tags[] = { { AV_CODEC_ID_TEXT, MKTAG('U', 'T', 'F', '8') }, + { AV_CODEC_ID_ASS, MKTAG('S', 'S', 'A', 0 ) }, + { AV_CODEC_ID_ASS, MKTAG('A', 'S', 'S', 0 ) }, { AV_CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') }, { AV_CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') }, { AV_CODEC_ID_DVB_TELETEXT, MKTAG('D', 'V', 'B', 'T') }, @@ -43,6 +45,7 @@ const AVCodecTag ff_nut_video_tags[] = { { AV_CODEC_ID_XFACE, MKTAG('X', 'F', 'A', 'C') }, { AV_CODEC_ID_VP9, MKTAG('V', 'P', '9', '0') }, { AV_CODEC_ID_HEVC, MKTAG('H', 'E', 'V', 'C') }, + { AV_CODEC_ID_CPIA, MKTAG('C', 'P', 'i', 'A') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) }, { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) }, { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 16 ) }, @@ -143,6 +146,11 @@ const AVCodecTag ff_nut_video_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0, 10) }, { AV_CODEC_ID_RAWVIDEO, MKTAG(10, 0, '4', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0, 12) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12, 0, '4', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10, 12) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12, 10, '4', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 12) }, { AV_CODEC_ID_RAWVIDEO, MKTAG(12, 0, '1', 'Y') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 16) }, @@ -221,6 +229,8 @@ const AVCodecTag ff_nut_audio_tags[] = { { AV_CODEC_ID_PCM_S24LE, MKTAG('P', 'S', 'D', 24 ) }, { AV_CODEC_ID_PCM_S32BE, MKTAG(32 , 'D', 'S', 'P') }, { AV_CODEC_ID_PCM_S32LE, MKTAG('P', 'S', 'D', 32 ) }, + { AV_CODEC_ID_PCM_S64BE, MKTAG(64 , 'D', 'S', 'P') }, + { AV_CODEC_ID_PCM_S64LE, MKTAG('P', 'S', 'D', 64 ) }, { AV_CODEC_ID_PCM_S8, MKTAG('P', 'S', 'D', 8 ) }, { AV_CODEC_ID_PCM_U16BE, MKTAG(16 , 'D', 'U', 'P') }, { AV_CODEC_ID_PCM_U16LE, MKTAG('P', 'U', 'D', 16 ) },