summaryrefslogtreecommitdiff
path: root/libavformat/sdp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-27 14:23:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-27 14:29:03 +0200
commite760424ddd202e01119592044394d505810ae00a (patch)
tree448d22660a84f4516c9e1a5caeb66f9005a25a7a /libavformat/sdp.c
parent00e1afd83f7585f4acb65911100d79e32c1f6fc4 (diff)
parent93e81ee81c33e74e6047053f6086d63d2f8293d4 (diff)
downloadffmpeg-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/sdp.c')
-rw-r--r--libavformat/sdp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 96b6c44e05..30941b7f89 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -575,7 +575,7 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c,
case AV_CODEC_ID_SPEEX:
av_strlcatf(buff, size, "a=rtpmap:%d speex/%d\r\n",
payload_type, c->sample_rate);
-
+ break;
default:
/* Nothing special to do here... */
break;