From fa570a5548a39a5d55f68a54766f0d0383776512 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Thu, 18 Jul 2013 05:44:40 -0300
Subject: riff: Add ITRK tag
Some players, like foobar2000 or modern versions of WMP, create WAV
files using the ITRK tag for track instead of IPRT
---
libavformat/riff.c | 1 +
libavformat/riffenc.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index c18fea5bca..87176c255f 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -392,6 +392,7 @@ const AVMetadataConv ff_riff_info_conv[] = {
{ "INAM", "title" },
{ "IPRD", "album" },
{ "IPRT", "track" },
+ { "ITRK", "track" },
{ "ISFT", "encoder" },
{ "ITCH", "encoded_by" },
{ 0 },
diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c
index 98e97c05ed..681a930212 100644
--- a/libavformat/riffenc.c
+++ b/libavformat/riffenc.c
@@ -257,7 +257,7 @@ void ff_riff_write_info_tag(AVIOContext *pb, const char *tag, const char *str)
static const char riff_tags[][5] = {
"IARL", "IART", "ICMS", "ICMT", "ICOP", "ICRD", "ICRP", "IDIM", "IDPI",
"IENG", "IGNR", "IKEY", "ILGT", "ILNG", "IMED", "INAM", "IPLT", "IPRD",
- "IPRT", "ISBJ", "ISFT", "ISHP", "ISRC", "ISRF", "ITCH",
+ "IPRT", "ITRK", "ISBJ", "ISFT", "ISHP", "ISRC", "ISRF", "ITCH",
{ 0 }
};
--
cgit v1.2.3
From 235bf1dab5315af84086eddbc92e8d2eb49e51f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <clement.boesch@smartjog.com>
Date: Thu, 31 May 2012 09:31:04 +0200
Subject: riff: add ISMP/timecode tag
---
libavformat/riff.c | 1 +
libavformat/riffenc.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 87176c255f..7dc8a5f0a3 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -394,6 +394,7 @@ const AVMetadataConv ff_riff_info_conv[] = {
{ "IPRT", "track" },
{ "ITRK", "track" },
{ "ISFT", "encoder" },
+ { "ISMP", "timecode" },
{ "ITCH", "encoded_by" },
{ 0 },
};
diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c
index 681a930212..8479d9da38 100644
--- a/libavformat/riffenc.c
+++ b/libavformat/riffenc.c
@@ -257,7 +257,7 @@ void ff_riff_write_info_tag(AVIOContext *pb, const char *tag, const char *str)
static const char riff_tags[][5] = {
"IARL", "IART", "ICMS", "ICMT", "ICOP", "ICRD", "ICRP", "IDIM", "IDPI",
"IENG", "IGNR", "IKEY", "ILGT", "ILNG", "IMED", "INAM", "IPLT", "IPRD",
- "IPRT", "ITRK", "ISBJ", "ISFT", "ISHP", "ISRC", "ISRF", "ITCH",
+ "IPRT", "ITRK", "ISBJ", "ISFT", "ISHP", "ISMP", "ISRC", "ISRF", "ITCH",
{ 0 }
};
--
cgit v1.2.3
From a52a1bc91274289d4edaf7f40b2d0c00151e1ef7 Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Sat, 10 Nov 2012 02:11:49 +0100
Subject: riff: add SMV2 FourCC for H264
Sample-Id: smv2.avi
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 7dc8a5f0a3..6be00f30e1 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -33,6 +33,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_H264, MKTAG('x', '2', '6', '4') },
{ AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') },
{ AV_CODEC_ID_H264, MKTAG('D', 'A', 'V', 'C') },
+ { AV_CODEC_ID_H264, MKTAG('S', 'M', 'V', '2') },
{ AV_CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') },
{ AV_CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
{ AV_CODEC_ID_H263, MKTAG('X', '2', '6', '3') },
--
cgit v1.2.3
From 51ace0fb921e7dcdf4879068fd474c61e9e506a9 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Thu, 3 Apr 2014 12:00:05 +0200
Subject: riff: add H264 from QNAP Systems
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 6be00f30e1..47031769da 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -35,6 +35,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_H264, MKTAG('D', 'A', 'V', 'C') },
{ AV_CODEC_ID_H264, MKTAG('S', 'M', 'V', '2') },
{ AV_CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') },
+ { AV_CODEC_ID_H264, MKTAG('Q', '2', '6', '4') }, /* QNAP surveillance system */
{ AV_CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
{ AV_CODEC_ID_H263, MKTAG('X', '2', '6', '3') },
{ AV_CODEC_ID_H263, MKTAG('T', '2', '6', '3') },
--
cgit v1.2.3
From 9d9d319a3c29af40e233237391b380e5d0754691 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Sun, 2 Dec 2012 00:43:39 +0100
Subject: riff: Add V264 for H264 in CCTV recordings
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 47031769da..20be960918 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -36,6 +36,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_H264, MKTAG('S', 'M', 'V', '2') },
{ AV_CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') },
{ AV_CODEC_ID_H264, MKTAG('Q', '2', '6', '4') }, /* QNAP surveillance system */
+ { AV_CODEC_ID_H264, MKTAG('V', '2', '6', '4') },
{ AV_CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
{ AV_CODEC_ID_H263, MKTAG('X', '2', '6', '3') },
{ AV_CODEC_ID_H263, MKTAG('T', '2', '6', '3') },
--
cgit v1.2.3
From dcb6e145ebb3a13e8f575703aa38eb5cf2be9c5d Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Thu, 3 Apr 2014 12:46:46 +0200
Subject: riff: add FourCC for GeoVision cameras
---
libavformat/riff.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 20be960918..4e09451aeb 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -36,7 +36,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_H264, MKTAG('S', 'M', 'V', '2') },
{ AV_CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') },
{ AV_CODEC_ID_H264, MKTAG('Q', '2', '6', '4') }, /* QNAP surveillance system */
- { AV_CODEC_ID_H264, MKTAG('V', '2', '6', '4') },
+ { AV_CODEC_ID_H264, MKTAG('V', '2', '6', '4') }, /* CCTV recordings */
+ { AV_CODEC_ID_H264, MKTAG('G', 'A', 'V', 'C') }, /* GeoVision camera */
{ AV_CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
{ AV_CODEC_ID_H263, MKTAG('X', '2', '6', '3') },
{ AV_CODEC_ID_H263, MKTAG('T', '2', '6', '3') },
--
cgit v1.2.3
From 915524e541f0119e20783d198b79f278a81f1eac Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Mon, 14 Oct 2013 16:29:58 +0200
Subject: riff: Support H.264 fourcc UMSV
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 4e09451aeb..cb8634ca78 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -38,6 +38,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_H264, MKTAG('Q', '2', '6', '4') }, /* QNAP surveillance system */
{ AV_CODEC_ID_H264, MKTAG('V', '2', '6', '4') }, /* CCTV recordings */
{ AV_CODEC_ID_H264, MKTAG('G', 'A', 'V', 'C') }, /* GeoVision camera */
+ { AV_CODEC_ID_H264, MKTAG('U', 'M', 'S', 'V') },
{ AV_CODEC_ID_H263, MKTAG('H', '2', '6', '3') },
{ AV_CODEC_ID_H263, MKTAG('X', '2', '6', '3') },
{ AV_CODEC_ID_H263, MKTAG('T', '2', '6', '3') },
--
cgit v1.2.3
From 9ab2d5a33c26686959a309a9116ac89238dde4f6 Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Mon, 5 Nov 2012 17:43:01 +0100
Subject: riff: add "lsvm" FourCC for H263.
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index cb8634ca78..7c5790b631 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -46,6 +46,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_H263, MKTAG('V', 'X', '1', 'K') },
{ AV_CODEC_ID_H263, MKTAG('Z', 'y', 'G', 'o') },
{ AV_CODEC_ID_H263, MKTAG('M', '2', '6', '3') },
+ { AV_CODEC_ID_H263, MKTAG('l', 's', 'v', 'm') },
{ AV_CODEC_ID_H263P, MKTAG('H', '2', '6', '3') },
{ AV_CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* Intel H.263 */
{ AV_CODEC_ID_H261, MKTAG('H', '2', '6', '1') },
--
cgit v1.2.3
From fa6a021121326777e70176047faa0d8de2ea48ac Mon Sep 17 00:00:00 2001
From: Compn <tempn@twmi.rr.com>
Date: Fri, 15 Nov 2013 09:45:08 -0500
Subject: riff: add G264 to mpeg4, only decodes keyframes
---
libavformat/riff.c | 2 ++
1 file changed, 2 insertions(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 7c5790b631..bb2b82d334 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -83,6 +83,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'T', '3') },
{ AV_CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'X') },
/* flipped video */
+ { AV_CODEC_ID_MPEG4, MKTAG('G', '2', '6', '4') },
+ /* flipped video */
{ AV_CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'G', 'I') },
--
cgit v1.2.3
From 32b0942c99d4ea9242b23c0781571a0837779689 Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Thu, 15 Aug 2013 14:12:47 +0200
Subject: riff: add DM4V FourCC
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index bb2b82d334..03a894ee00 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -86,6 +86,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MPEG4, MKTAG('G', '2', '6', '4') },
/* flipped video */
{ AV_CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') },
+ { AV_CODEC_ID_MPEG4, MKTAG('D', 'M', '4', 'V') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'G', 'I') },
{ AV_CODEC_ID_MPEG4, MKTAG('I', 'N', 'M', 'C') },
--
cgit v1.2.3
From 684e43c5e3fd6c838ee654e257f703f379935701 Mon Sep 17 00:00:00 2001
From: Compn <tempn@twmi.rr.com>
Date: Tue, 19 Nov 2013 14:24:25 -0500
Subject: riff: add DYM4 mpeg4 fourcc
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 03a894ee00..83fa4be130 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -88,6 +88,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'M', '4', 'V') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') },
+ { AV_CODEC_ID_MPEG4, MKTAG('D', 'Y', 'M', '4') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'G', 'I') },
{ AV_CODEC_ID_MPEG4, MKTAG('I', 'N', 'M', 'C') },
/* Ephv MPEG-4 */
--
cgit v1.2.3
From ade32b4a84000b4f0833f5bfaede5595e01bcc8f Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Thu, 3 Apr 2014 12:56:33 +0200
Subject: riff: add "SM4V" FourCC
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 83fa4be130..a60d750c0f 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -102,6 +102,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') },
/* Samsung SHR-6040 */
{ AV_CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') },
+ { AV_CODEC_ID_MPEG4, MKTAG('S', 'M', '4', 'V') },
{ AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'X') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'r', 'e', 'X') },
{ AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
--
cgit v1.2.3
From f5f18aecef277030e38e9107be310f744d12a4f8 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Thu, 3 Apr 2014 12:57:16 +0200
Subject: riff: Support decoding ASP variant from QNAP Systems
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index a60d750c0f..b68abce118 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -105,6 +105,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MPEG4, MKTAG('S', 'M', '4', 'V') },
{ AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'X') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'r', 'e', 'X') },
+ { AV_CODEC_ID_MPEG4, MKTAG('Q', 'M', 'P', '4') }, /* QNAP Systems */
{ AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
{ AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') },
{ AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') },
--
cgit v1.2.3
From 96dd7b23323043e4f158a991458ad461a6ee8621 Mon Sep 17 00:00:00 2001
From: Compn <tempn@twmi.rr.com>
Date: Thu, 3 Apr 2014 12:58:13 +0200
Subject: riff: add PLV1 fourcc to mpeg4
Sample-Id: york-water-meteor.avi
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index b68abce118..fa8ed3e2be 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -106,6 +106,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'X') },
{ AV_CODEC_ID_MPEG4, MKTAG('D', 'r', 'e', 'X') },
{ AV_CODEC_ID_MPEG4, MKTAG('Q', 'M', 'P', '4') }, /* QNAP Systems */
+ { AV_CODEC_ID_MPEG4, MKTAG('P', 'L', 'V', '1') }, /* Pelco DVR MPEG-4 */
{ AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
{ AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') },
{ AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') },
--
cgit v1.2.3
From adf0ff000055f09f7439e96aaa8178ed763013ee Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Sat, 10 Nov 2012 00:24:09 +0100
Subject: riff: add "GXVE" FourCC for WMV2
Sample-Id: vivd.avi
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index fa8ed3e2be..b82b5da59c 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -123,6 +123,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', '4', '1') },
{ AV_CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') },
{ AV_CODEC_ID_WMV2, MKTAG('W', 'M', 'V', '2') },
+ { AV_CODEC_ID_WMV2, MKTAG('G', 'X', 'V', 'E') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'd') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') },
--
cgit v1.2.3
From 6aa7cbd58c3e581250c23296736a612252354f00 Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Thu, 3 Apr 2014 15:08:04 +0200
Subject: riff: add dvis/pdvc FourCCs
---
libavformat/riff.c | 2 ++
1 file changed, 2 insertions(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index b82b5da59c..0787f6350a 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -139,6 +139,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 's') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') },
+ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'i', 's') },
+ { AV_CODEC_ID_DVVIDEO, MKTAG('p', 'd', 'v', 'c') },
{ AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '1') },
{ AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') },
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') },
--
cgit v1.2.3
From a1c58b3acd073047e8c2f3f3817fce3f77b4ac89 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Thu, 3 Apr 2014 15:08:40 +0200
Subject: riff: Support NTSC forward dvcpro videos
PAL looks incorrect.
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 0787f6350a..6a8885889f 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -141,6 +141,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'i', 's') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('p', 'd', 'v', 'c') },
+ { AV_CODEC_ID_DVVIDEO, MKTAG('S', 'L', '2', '5') },
{ AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '1') },
{ AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') },
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') },
--
cgit v1.2.3
From eaec09a575181a09c57a85778df89018a48c98b5 Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Thu, 3 Apr 2014 15:09:23 +0200
Subject: riff: Add SLDV FourCC for dvvideo
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 6a8885889f..6b080156fd 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -142,6 +142,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'i', 's') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('p', 'd', 'v', 'c') },
{ AV_CODEC_ID_DVVIDEO, MKTAG('S', 'L', '2', '5') },
+ { AV_CODEC_ID_DVVIDEO, MKTAG('S', 'L', 'D', 'V') },
{ AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '1') },
{ AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') },
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') },
--
cgit v1.2.3
From 771cb3e59239f45f789c0841b0df7600271fa1a7 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 3 Apr 2014 15:10:45 +0200
Subject: riff: support BW10 as mpeg1
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 6b080156fd..7a5f1f4466 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -162,6 +162,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
/* Matrox MPEG-2 intra-only */
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '1') },
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', 'v') },
+ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('B', 'W', '1', '0') },
{ AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
{ AV_CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
{ AV_CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') },
--
cgit v1.2.3
From 9ff6429b0742723560198963ef97e2b8c111b0a3 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 3 Apr 2014 15:31:46 +0200
Subject: riff: Support XMPG as mpeg1
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 7a5f1f4466..7396fc3a68 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -163,6 +163,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '1') },
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', 'v') },
{ AV_CODEC_ID_MPEG1VIDEO, MKTAG('B', 'W', '1', '0') },
+ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('X', 'M', 'P', 'G') }, /* Xing MPEG intra only */
{ AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
{ AV_CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
{ AV_CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') },
--
cgit v1.2.3
From c9787f034c6a442e5fba8e9cad5c702281e6eaf3 Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Thu, 3 Apr 2014 15:34:44 +0200
Subject: riff: Add "S263" FourCC
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 7396fc3a68..794d0e5a9b 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -275,6 +275,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') },
{ AV_CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') },
{ AV_CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') },
+ { AV_CODEC_ID_FLV1, MKTAG('S', '2', '6', '3') },
{ AV_CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') },
{ AV_CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') },
{ AV_CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') },
--
cgit v1.2.3
From 7100f3c07dbfec9e940cb1bf716edceaefa9c6e6 Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Thu, 3 Apr 2014 15:37:20 +0200
Subject: riff: add "YUV8" FourCC
Sample-Id: MAILTEST.AVI
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 794d0e5a9b..24f1506cd6 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -291,6 +291,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_VC1IMAGE, MKTAG('W', 'V', 'P', '2') },
{ AV_CODEC_ID_LOCO, MKTAG('L', 'O', 'C', 'O') },
{ AV_CODEC_ID_WNV1, MKTAG('W', 'N', 'V', '1') },
+ { AV_CODEC_ID_WNV1, MKTAG('Y', 'U', 'V', '8') },
{ AV_CODEC_ID_AASC, MKTAG('A', 'A', 'S', 'C') },
{ AV_CODEC_ID_INDEO2, MKTAG('R', 'T', '2', '1') },
{ AV_CODEC_ID_FRAPS, MKTAG('F', 'P', 'S', '1') },
--
cgit v1.2.3
From ae58466994be225fbc497be1aeb3556461f1825a Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Thu, 3 Apr 2014 15:39:40 +0200
Subject: riff: support 'aas4' FourCC
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 24f1506cd6..90136924ed 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -292,6 +292,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_LOCO, MKTAG('L', 'O', 'C', 'O') },
{ AV_CODEC_ID_WNV1, MKTAG('W', 'N', 'V', '1') },
{ AV_CODEC_ID_WNV1, MKTAG('Y', 'U', 'V', '8') },
+ { AV_CODEC_ID_AASC, MKTAG('A', 'A', 'S', '4') }, /* Autodesk 24 bit RLE compressor */
{ AV_CODEC_ID_AASC, MKTAG('A', 'A', 'S', 'C') },
{ AV_CODEC_ID_INDEO2, MKTAG('R', 'T', '2', '1') },
{ AV_CODEC_ID_FRAPS, MKTAG('F', 'P', 'S', '1') },
--
cgit v1.2.3
From fb6c21fa8caa54e96869b2d3b64efb76d5f878bc Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 3 Apr 2014 16:12:55 +0200
Subject: riff: add escape130 FourCC
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 90136924ed..b33c31e55d 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -329,6 +329,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'H', '0') },
{ AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'H', '2') },
{ AV_CODEC_ID_VBLE, MKTAG('V', 'B', 'L', 'E') },
+ { AV_CODEC_ID_ESCAPE130, MKTAG('E', '1', '3', '0') },
{ AV_CODEC_ID_DXTORY, MKTAG('x', 't', 'o', 'r') },
{ AV_CODEC_ID_ZEROCODEC, MKTAG('Z', 'E', 'C', 'O') },
{ AV_CODEC_ID_MSS1, MKTAG('M', 'S', 'S', '1') },
--
cgit v1.2.3
From 228af18a98321f3358a195a3eb213e81334508fb Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Thu, 3 Apr 2014 16:15:09 +0200
Subject: riff: Support FLIC FourCC
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index b33c31e55d..04ef1bc86b 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -332,6 +332,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_ESCAPE130, MKTAG('E', '1', '3', '0') },
{ AV_CODEC_ID_DXTORY, MKTAG('x', 't', 'o', 'r') },
{ AV_CODEC_ID_ZEROCODEC, MKTAG('Z', 'E', 'C', 'O') },
+ { AV_CODEC_ID_FLIC, MKTAG('A', 'F', 'L', 'C') },
{ AV_CODEC_ID_MSS1, MKTAG('M', 'S', 'S', '1') },
{ AV_CODEC_ID_MSA1, MKTAG('M', 'S', 'A', '1') },
{ AV_CODEC_ID_TSCC2, MKTAG('T', 'S', 'C', '2') },
--
cgit v1.2.3
From 10a14bd574574dba3d982f3666a535cda1363f4c Mon Sep 17 00:00:00 2001
From: Compn <tempn@twmi.rr.com>
Date: Thu, 3 Apr 2014 16:18:26 +0200
Subject: riff: map 0x0038 to amrnb
Sample-Id: 40709.avi
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 04ef1bc86b..bda5d89bfd 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -367,6 +367,7 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_TRUESPEECH, 0x0022 },
{ AV_CODEC_ID_GSM_MS, 0x0031 },
{ AV_CODEC_ID_GSM_MS, 0x0032 },
+ { AV_CODEC_ID_AMR_NB, 0x0038 }, /* rogue format number */
{ AV_CODEC_ID_ADPCM_G726, 0x0045 },
{ AV_CODEC_ID_MP2, 0x0050 },
{ AV_CODEC_ID_MP3, 0x0055 },
--
cgit v1.2.3
From b7a12ab95bbd672ef015dc2d2c04a293e1185fe8 Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Thu, 3 Apr 2014 16:19:32 +0200
Subject: riff: add G723_1 wav tag
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index bda5d89bfd..3749640de9 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -368,6 +368,7 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_GSM_MS, 0x0031 },
{ AV_CODEC_ID_GSM_MS, 0x0032 },
{ AV_CODEC_ID_AMR_NB, 0x0038 }, /* rogue format number */
+ { AV_CODEC_ID_G723_1, 0x0042 },
{ AV_CODEC_ID_ADPCM_G726, 0x0045 },
{ AV_CODEC_ID_MP2, 0x0050 },
{ AV_CODEC_ID_MP3, 0x0055 },
--
cgit v1.2.3
From 7b600ea0da8bf6a008134539aa8284ee171029da Mon Sep 17 00:00:00 2001
From: Compn <tempn@twmi.rr.com>
Date: Tue, 3 Sep 2013 08:25:43 -0400
Subject: riff: add 0x64 to g726
Sample-Id: g726-test1.wav
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 3749640de9..49989d5db6 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -378,6 +378,7 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_ADPCM_IMA_DK4, 0x0061 },
/* rogue format number */
{ AV_CODEC_ID_ADPCM_IMA_DK3, 0x0062 },
+ { AV_CODEC_ID_ADPCM_G726, 0x0064 },
{ AV_CODEC_ID_ADPCM_IMA_WAV, 0x0069 },
{ AV_CODEC_ID_METASOUND, 0x0075 },
{ AV_CODEC_ID_AAC, 0x00ff },
--
cgit v1.2.3
From 00ccdcd88c9315e750ffebf364e4209176a1b8cb Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Thu, 3 Apr 2014 16:29:32 +0200
Subject: riff: add 0x594a TwoCC for Xan DPCM
Sample-Id: crusader-no-regret.avi
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 49989d5db6..fe1cc03eef 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -402,6 +402,7 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_PCM_MULAW, 0x6c75 },
{ AV_CODEC_ID_AAC, 0x706d },
{ AV_CODEC_ID_AAC, 0x4143 },
+ { AV_CODEC_ID_XAN_DPCM, 0x594a },
{ AV_CODEC_ID_SPEEX, 0xA109 },
{ AV_CODEC_ID_FLAC, 0xF1AC },
{ AV_CODEC_ID_ADPCM_SWF, ('S' << 8) + 'F' },
--
cgit v1.2.3
From 1e8c4fb8fc1adefdb7113425ed5653b910efc88c Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Thu, 3 Apr 2014 16:30:51 +0200
Subject: riff: support 0xa100 TwoCC for G723_1
Sample-Id: 4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index fe1cc03eef..08fe5b9bd8 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -403,6 +403,7 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_AAC, 0x706d },
{ AV_CODEC_ID_AAC, 0x4143 },
{ AV_CODEC_ID_XAN_DPCM, 0x594a },
+ { AV_CODEC_ID_G723_1, 0xA100 }, /* Comverse Infosys Ltd. G723 1 */
{ AV_CODEC_ID_SPEEX, 0xA109 },
{ AV_CODEC_ID_FLAC, 0xF1AC },
{ AV_CODEC_ID_ADPCM_SWF, ('S' << 8) + 'F' },
--
cgit v1.2.3
From ce58ead40dd16f272ec1f127f04f69df67c7cd35 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Thu, 3 Apr 2014 16:32:59 +0200
Subject: riff: Add an additional AAC TwoCC
Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx
---
libavformat/riff.c | 1 +
1 file changed, 1 insertion(+)
(limited to 'libavformat')
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 08fe5b9bd8..6a4d01bb7d 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -404,6 +404,7 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_AAC, 0x4143 },
{ AV_CODEC_ID_XAN_DPCM, 0x594a },
{ AV_CODEC_ID_G723_1, 0xA100 }, /* Comverse Infosys Ltd. G723 1 */
+ { AV_CODEC_ID_AAC, 0xA106 },
{ AV_CODEC_ID_SPEEX, 0xA109 },
{ AV_CODEC_ID_FLAC, 0xF1AC },
{ AV_CODEC_ID_ADPCM_SWF, ('S' << 8) + 'F' },
--
cgit v1.2.3