diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-27 14:23:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-27 14:29:03 +0200 |
| commit | e760424ddd202e01119592044394d505810ae00a (patch) | |
| tree | 448d22660a84f4516c9e1a5caeb66f9005a25a7a /libavformat/rtpenc.c | |
| parent | 00e1afd83f7585f4acb65911100d79e32c1f6fc4 (diff) | |
| parent | 93e81ee81c33e74e6047053f6086d63d2f8293d4 (diff) | |
| download | ffmpeg-e760424ddd202e01119592044394d505810ae00a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
nutdec: const correctness for get_v_trace/get_s_trace function arguments
truemotion2: Request samples for old TM2 headers
rtpdec: Remove a useless ff_ prefix from a static symbol
rtpdec: Support depacketizing speex
rtpenc: Add support for packetizing speex
Conflicts:
libavformat/rtpdec.c
libavformat/sdp.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
| -rw-r--r-- | libavformat/rtpenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 653eded94c..ea678a6792 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -75,8 +75,8 @@ static int is_supported(enum AVCodecID id) case AV_CODEC_ID_ADPCM_G722: case AV_CODEC_ID_ADPCM_G726: case AV_CODEC_ID_ILBC: - case AV_CODEC_ID_SPEEX: case AV_CODEC_ID_MJPEG: + case AV_CODEC_ID_SPEEX: return 1; default: return 0; |