diff options
| author | Benjamin Larsson <banan@ludd.ltu.se> | 2006-08-20 19:08:05 +0000 |
|---|---|---|
| committer | Benjamin Larsson <banan@ludd.ltu.se> | 2006-08-20 19:08:05 +0000 |
| commit | 6c496518e809fb9441dbaf74178b6b4de0cc686c (patch) | |
| tree | d6bee2634304114f3b9679f38f88b4af7401a0ba | |
| parent | 27cd2c10b045a412a4fc571475ef852ceb08208c (diff) | |
Added codec id for QCELP.
Originally committed as revision 6036 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavformat/isom.c | 1 | ||||
| -rw-r--r-- | libavformat/rtp.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 6bb82dec40..66a09ca1c2 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 f4b468deb4..cdd079e5c4 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 e5a17004f1..f358f59c68 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}, |