From 6c496518e809fb9441dbaf74178b6b4de0cc686c Mon Sep 17 00:00:00 2001
From: Benjamin Larsson <banan@ludd.ltu.se>
Date: Sun, 20 Aug 2006 19:08:05 +0000
Subject: [PATCH] Added codec id for QCELP.
Originally committed as revision 6036 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/avcodec.h | 1 +
libavformat/isom.c | 1 +
libavformat/rtp.c | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 6bb82dec40c..66a09ca1c25 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -200,6 +200,7 @@ enum CodecID {
CODEC_ID_TRUESPEECH,
CODEC_ID_TTA,
CODEC_ID_SMACKAUDIO,
+ CODEC_ID_QCELP,
/* subtitle codecs */
CODEC_ID_DVD_SUBTITLE= 0x17000,
diff --git a/libavformat/isom.c b/libavformat/isom.c
index f4b468deb4b..cdd079e5c4c 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -43,6 +43,7 @@ const CodecTag ff_mov_obj_type[] = {
{ CODEC_ID_MJPEG , 108 },
{ CODEC_ID_PCM_S16LE , 224 },
{ CODEC_ID_VORBIS , 221 },
+ { CODEC_ID_QCELP , 225 },
{ CODEC_ID_AC3 , 226 },
{ CODEC_ID_PCM_ALAW , 227 },
{ CODEC_ID_PCM_MULAW , 228 },
diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index e5a17004f10..f358f59c68f 100644
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -58,7 +58,7 @@ AVRtpPayloadType_t AVRtpPayloadTypes[]=
{9, "G722", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1},
{10, "L16", CODEC_TYPE_AUDIO, CODEC_ID_PCM_S16BE, 44100, 2},
{11, "L16", CODEC_TYPE_AUDIO, CODEC_ID_PCM_S16BE, 44100, 1},
- {12, "QCELP", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1},
+ {12, "QCELP", CODEC_TYPE_AUDIO, CODEC_ID_QCELP, 8000, 1},
{13, "CN", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1},
{14, "MPA", CODEC_TYPE_AUDIO, CODEC_ID_MP2, 90000, -1},
{15, "G728", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1},
--
GitLab