summaryrefslogtreecommitdiff
path: root/libavformat/rtp.c
diff options
context:
space:
mode:
authorRyan Martell <rdm4@martellventures.com>2006-11-07 22:10:07 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2006-11-07 22:10:07 +0000
commit1d1be919ce04327dee6169d3e0382fb680157665 (patch)
treec369d9e65dd7ee819cc2dc822d41069565af0df0 /libavformat/rtp.c
parentabc7202f45b61ae586972618b90fe613f6d76720 (diff)
add support for rtp/h264 streaming
Patch by Ryan Martell % rdm4 A martellventures P com % Original thread: Date: Nov 6, 2006 8:56 PM Subject: [Ffmpeg-devel] [PATCH] H.264 via RTP Originally committed as revision 6936 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtp.c')
-rw-r--r--libavformat/rtp.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index b30000bebd..7bef395f3a 100644
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -34,11 +34,7 @@
#include <netdb.h>
#include "rtp_internal.h"
-
-//#define RTP_H264
-#ifdef RTP_H264
- #include "rtp_h264.h"
-#endif
+#include "rtp_h264.h"
//#define DEBUG
@@ -202,9 +198,7 @@ void av_register_rtp_dynamic_payload_handlers()
{
register_dynamic_payload_handler(&mp4v_es_handler);
register_dynamic_payload_handler(&mpeg4_generic_handler);
-#ifdef RTP_H264
register_dynamic_payload_handler(&ff_h264_dynamic_handler);
-#endif
}
int rtp_get_codec_info(AVCodecContext *codec, int payload_type)
@@ -488,9 +482,7 @@ RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *r
case CODEC_ID_MP2:
case CODEC_ID_MP3:
case CODEC_ID_MPEG4:
-#ifdef RTP_H264
case CODEC_ID_H264:
-#endif
st->need_parsing = 1;
break;
default: