diff options
| author | Josh Allmann <joshua.allmann@gmail.com> | 2010-06-25 07:58:38 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-06-25 07:58:38 +0000 |
| commit | 9b3788efc341d99dea6107a3683a2d73a1b1effe (patch) | |
| tree | 3822f44303cdbd42b5fa2ba04af88126d3b892c0 /libavformat/rtpdec.c | |
| parent | 30619e6e597ad5dc9a6312278b8dc0d9f3c45e74 (diff) | |
| download | ffmpeg-9b3788efc341d99dea6107a3683a2d73a1b1effe.tar.gz | |
RTSP: Decouple MPEG-4 and AAC specific parts from rtsp.c
Patch by Josh Allmann, joshua dot allmann at gmail
Originally committed as revision 23769 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtpdec.c')
| -rw-r--r-- | libavformat/rtpdec.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 0d2df59a75..0b316e3c48 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -34,6 +34,7 @@ #include "rtpdec_asf.h" #include "rtpdec_h263.h" #include "rtpdec_h264.h" +#include "rtpdec_mpeg4.h" #include "rtpdec_xiph.h" //#define DEBUG @@ -50,9 +51,6 @@ /* statistics functions */ RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler= NULL; -static RTPDynamicProtocolHandler mp4v_es_handler= {"MP4V-ES", AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG4}; -static RTPDynamicProtocolHandler mpeg4_generic_handler= {"mpeg4-generic", AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC}; - void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler) { handler->next= RTPFirstDynamicPayloadHandler; @@ -61,8 +59,8 @@ void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler) void av_register_rtp_dynamic_payload_handlers(void) { - ff_register_dynamic_payload_handler(&mp4v_es_handler); - ff_register_dynamic_payload_handler(&mpeg4_generic_handler); + ff_register_dynamic_payload_handler(&ff_mp4v_es_dynamic_handler); + ff_register_dynamic_payload_handler(&ff_mpeg4_generic_dynamic_handler); ff_register_dynamic_payload_handler(&ff_amr_nb_dynamic_handler); ff_register_dynamic_payload_handler(&ff_amr_wb_dynamic_handler); ff_register_dynamic_payload_handler(&ff_h263_1998_dynamic_handler); |