summaryrefslogtreecommitdiff
path: root/libavformat/rtsp.c
diff options
context:
space:
mode:
authorJosh Allmann <joshua.allmann@gmail.com>2010-04-01 21:43:22 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2010-04-01 21:43:22 +0000
commit339f5f39573dcdcb16f2dba563f784340a61b189 (patch)
tree4b09941b39619aa26385d8af5f4c45e6c26ce839 /libavformat/rtsp.c
parentcb92a9c0387d404078be4983ed5720ed5ac173fc (diff)
Merge Vorbis / Theora depayloaders.
Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>. Originally committed as revision 22768 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtsp.c')
-rw-r--r--libavformat/rtsp.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 352426e333..8841ea80c6 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -37,7 +37,6 @@
#include "rtpdec.h"
#include "rdt.h"
#include "rtpdec_asf.h"
-#include "rtpdec_vorbis.h"
//#define DEBUG
//#define DEBUG_RTP_TCP
@@ -217,9 +216,6 @@ static void sdp_parse_fmtp_config(AVCodecContext * codec, void *ctx,
hex_to_data(codec->extradata, value);
}
break;
- case CODEC_ID_VORBIS:
- ff_vorbis_parse_fmtp_config(codec, ctx, attr, value);
- break;
default:
break;
}