Commit 1d1be919 authored by Ryan Martell's avatar Ryan Martell Committed by Guillaume Poirier

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
parent abc7202f
......@@ -168,7 +168,7 @@ OBJS+= avio.o aviobuf.o
ifeq ($(CONFIG_PROTOCOLS),yes)
OBJS+= file.o
ifeq ($(CONFIG_NETWORK),yes)
OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o
OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o rtp_h264.o
# BeOS and Darwin network stuff
ifeq ($(NEED_INET_ATON),yes)
OBJS+= barpainet.o
......
......@@ -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:
......
This diff is collapsed.
/*
* RTP H264 Protocol (RFC3984)
* Copyright (c) 2006 Ryan Martell.
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef RTP_H264_H
#define RTP_H264_H
extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;
#endif /* RTP_H264_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment