Browse Source

rtpproto: Move rtpproto specific function declarations to a separate header

Mixing these with the rtp depacketizer functions in rtpdec.h is
no good.

Signed-off-by: Martin Storsjö <martin@martin.st>
tags/n2.1
Martin Storsjö 12 years ago
parent
commit
b7e6da988b
6 changed files with 36 additions and 5 deletions
  1. +1
    -0
      avserver.c
  2. +0
    -4
      libavformat/rtpdec.h
  3. +2
    -1
      libavformat/rtpproto.c
  4. +31
    -0
      libavformat/rtpproto.h
  5. +1
    -0
      libavformat/rtsp.c
  6. +1
    -0
      libavformat/rtspdec.c

+ 1
- 0
avserver.c View File

@@ -32,6 +32,7 @@
#include "libavformat/network.h"
#include "libavformat/os_support.h"
#include "libavformat/rtpdec.h"
#include "libavformat/rtpproto.h"
#include "libavformat/rtsp.h"
#include "libavformat/avio_internal.h"
#include "libavformat/internal.h"


+ 0
- 4
libavformat/rtpdec.h View File

@@ -51,10 +51,6 @@ int ff_rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
void ff_rtp_parse_close(RTPDemuxContext *s);
int64_t ff_rtp_queued_packet_time(RTPDemuxContext *s);
void ff_rtp_reset_packet_queue(RTPDemuxContext *s);
int ff_rtp_get_local_rtp_port(URLContext *h);
int ff_rtp_get_local_rtcp_port(URLContext *h);

int ff_rtp_set_remote_url(URLContext *h, const char *uri);

/**
* Send a dummy packet on both port pairs to set up the connection


+ 2
- 1
libavformat/rtpproto.c View File

@@ -28,7 +28,8 @@
#include "libavutil/avstring.h"
#include "avformat.h"
#include "avio_internal.h"
#include "rtpdec.h"
#include "rtp.h"
#include "rtpproto.h"
#include "url.h"

#include <stdarg.h>


+ 31
- 0
libavformat/rtpproto.h View File

@@ -0,0 +1,31 @@
/*
* RTP network protocol
*
* This file is part of Libav.
*
* Libav 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.
*
* Libav 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 Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef AVFORMAT_RTPPROTO_H
#define AVFORMAT_RTPPROTO_H

#include "url.h"

int ff_rtp_set_remote_url(URLContext *h, const char *uri);

int ff_rtp_get_local_rtp_port(URLContext *h);
int ff_rtp_get_local_rtcp_port(URLContext *h);

#endif /* AVFORMAT_RTPPROTO_H */

+ 1
- 0
libavformat/rtsp.c View File

@@ -41,6 +41,7 @@
#include "rtsp.h"

#include "rtpdec.h"
#include "rtpproto.h"
#include "rdt.h"
#include "rtpdec_formats.h"
#include "rtpenc_chain.h"


+ 1
- 0
libavformat/rtspdec.c View File

@@ -29,6 +29,7 @@
#include "internal.h"
#include "network.h"
#include "os_support.h"
#include "rtpproto.h"
#include "rtsp.h"
#include "rdt.h"
#include "url.h"


Loading…
Cancel
Save