diff options
| author | Martin Storsjö <martin@martin.st> | 2010-09-15 17:35:39 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-09-15 17:35:39 +0000 |
| commit | 0048a2a8d347c9a81a781f4126023018f1b29527 (patch) | |
| tree | eb9e71c1e3edaa6eface988067c0fac44bd5656b /libavformat/rtp.c | |
| parent | 82eac2f3216534c065c5023e5599720bd17bed26 (diff) | |
| download | ffmpeg-0048a2a8d347c9a81a781f4126023018f1b29527.tar.gz | |
Handle G.722 in RTP, and all the exceptions mandated in RFC 3551
Originally committed as revision 25125 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtp.c')
| -rw-r--r-- | libavformat/rtp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtp.c b/libavformat/rtp.c index a8dcfd79de..70c5e99704 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -48,7 +48,7 @@ static const struct {6, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 16000, 1}, {7, "LPC", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, {8, "PCMA", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_ALAW, 8000, 1}, - {9, "G722", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, + {9, "G722", AVMEDIA_TYPE_AUDIO, CODEC_ID_ADPCM_G722, 8000, 1}, {10, "L16", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_S16BE, 44100, 2}, {11, "L16", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_S16BE, 44100, 1}, {12, "QCELP", AVMEDIA_TYPE_AUDIO, CODEC_ID_QCELP, 8000, 1}, |