From 800b9c24b71413e9265be47c47c30be35bc04bd1 Mon Sep 17 00:00:00 2001
From: Benjamin Larsson <banan@ludd.ltu.se>
Date: Wed, 27 Feb 2008 20:34:44 +0000
Subject: [PATCH] Add more riff IDs to support remuxing.
Originally committed as revision 12266 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/avcodec.h | 3 +++
libavformat/riff.c | 3 +++
2 files changed, 6 insertions(+)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index fe4705d8415..32dd4da281e 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -176,6 +176,8 @@ enum CodecID {
CODEC_ID_VB,
CODEC_ID_PCX,
CODEC_ID_SUNRAST,
+ CODEC_ID_INDEO4,
+ CODEC_ID_INDEO5,
/* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
@@ -284,6 +286,7 @@ enum CodecID {
CODEC_ID_SPEEX,
CODEC_ID_WMAVOICE,
CODEC_ID_WMAPRO,
+ CODEC_ID_WMALOSSLESS,
/* subtitle codecs */
CODEC_ID_DVD_SUBTITLE= 0x17000,
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 792246f0053..6527e2e6e31 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -121,6 +121,8 @@ const AVCodecTag codec_bmp_tags[] = {
{ CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },
+ { CODEC_ID_INDEO4, MKTAG('I', 'V', '4', '1') },
+ { CODEC_ID_INDEO5, MKTAG('I', 'V', '5', '0') },
{ CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') },
{ CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') },
{ CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') },
@@ -199,6 +201,7 @@ const AVCodecTag codec_wav_tags[] = {
{ CODEC_ID_WMAV1, 0x0160 },
{ CODEC_ID_WMAV2, 0x0161 },
{ CODEC_ID_WMAPRO, 0x0162 },
+ { CODEC_ID_WMALOSSLESS, 0x0163 },
{ CODEC_ID_ADPCM_CT, 0x0200 },
{ CODEC_ID_ATRAC3, 0x0270 },
{ CODEC_ID_IMC, 0x0401 },
--
GitLab