[FFmpeg-cvslog] r24596 - in trunk/libavformat: rtpdec.c rtpdec_amr.c rtpdec_amr.h rtpdec_asf.c rtpdec_asf.h rtpdec_formats.h rtpdec_h263.c rtpdec_h263.h rtpdec_h264.c rtpdec_h264.h rtpdec_mpeg4.c rtpdec_mpeg4.h rt...

mstorsjo subversion
Fri Jul 30 14:04:27 CEST 2010


Author: mstorsjo
Date: Fri Jul 30 14:04:27 2010
New Revision: 24596

Log:
Remove mostly unnecessary rtpdec_*.h files, store the declarations in one file

Added:
   trunk/libavformat/rtpdec_formats.h
Deleted:
   trunk/libavformat/rtpdec_amr.h
   trunk/libavformat/rtpdec_asf.h
   trunk/libavformat/rtpdec_h263.h
   trunk/libavformat/rtpdec_h264.h
   trunk/libavformat/rtpdec_mpeg4.h
   trunk/libavformat/rtpdec_qdm2.h
   trunk/libavformat/rtpdec_svq3.h
   trunk/libavformat/rtpdec_xiph.h
Modified:
   trunk/libavformat/rtpdec.c
   trunk/libavformat/rtpdec_amr.c
   trunk/libavformat/rtpdec_asf.c
   trunk/libavformat/rtpdec_h263.c
   trunk/libavformat/rtpdec_h264.c
   trunk/libavformat/rtpdec_mpeg4.c
   trunk/libavformat/rtpdec_qdm2.c
   trunk/libavformat/rtpdec_svq3.c
   trunk/libavformat/rtpdec_xiph.c
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtpdec.c
==============================================================================
--- trunk/libavformat/rtpdec.c	Fri Jul 30 13:56:01 2010	(r24595)
+++ trunk/libavformat/rtpdec.c	Fri Jul 30 14:04:27 2010	(r24596)
@@ -30,14 +30,7 @@
 #include "network.h"
 
 #include "rtpdec.h"
-#include "rtpdec_amr.h"
-#include "rtpdec_asf.h"
-#include "rtpdec_h263.h"
-#include "rtpdec_h264.h"
-#include "rtpdec_mpeg4.h"
-#include "rtpdec_qdm2.h"
-#include "rtpdec_svq3.h"
-#include "rtpdec_xiph.h"
+#include "rtpdec_formats.h"
 
 //#define DEBUG
 

Modified: trunk/libavformat/rtpdec_amr.c
==============================================================================
--- trunk/libavformat/rtpdec_amr.c	Fri Jul 30 13:56:01 2010	(r24595)
+++ trunk/libavformat/rtpdec_amr.c	Fri Jul 30 14:04:27 2010	(r24596)
@@ -20,7 +20,7 @@
  */
 
 #include "avformat.h"
-#include "rtpdec_amr.h"
+#include "rtpdec_formats.h"
 #include "libavutil/avstring.h"
 
 static const uint8_t frame_sizes_nb[16] = {

Modified: trunk/libavformat/rtpdec_asf.c
==============================================================================
--- trunk/libavformat/rtpdec_asf.c	Fri Jul 30 13:56:01 2010	(r24595)
+++ trunk/libavformat/rtpdec_asf.c	Fri Jul 30 14:04:27 2010	(r24596)
@@ -29,7 +29,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 #include "rtp.h"
-#include "rtpdec_asf.h"
+#include "rtpdec_formats.h"
 #include "rtsp.h"
 #include "asf.h"
 

Added: trunk/libavformat/rtpdec_formats.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libavformat/rtpdec_formats.h	Fri Jul 30 14:04:27 2010	(r24596)
@@ -0,0 +1,48 @@
+/*
+ * RTP depacketizer declarations
+ * Copyright (c) 2010 Martin Storsjo
+ *
+ * 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 AVFORMAT_RTPDEC_FORMATS_H
+#define AVFORMAT_RTPDEC_FORMATS_H
+
+#include "rtpdec.h"
+
+/**
+ * Parse a Windows Media Server-specific SDP line
+ *
+ * @param s RTSP demux context
+ */
+int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p);
+
+extern RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_ms_rtp_asf_pfa_handler;
+extern RTPDynamicProtocolHandler ff_ms_rtp_asf_pfv_handler;
+extern RTPDynamicProtocolHandler ff_qdm2_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_svq3_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_theora_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_vorbis_dynamic_handler;
+
+#endif /* AVFORMAT_RTPDEC_FORMATS_H */

Modified: trunk/libavformat/rtpdec_h263.c
==============================================================================
--- trunk/libavformat/rtpdec_h263.c	Fri Jul 30 13:56:01 2010	(r24595)
+++ trunk/libavformat/rtpdec_h263.c	Fri Jul 30 14:04:27 2010	(r24596)
@@ -20,7 +20,7 @@
  */
 
 #include "avformat.h"
-#include "rtpdec_h263.h"
+#include "rtpdec_formats.h"
 #include "libavutil/intreadwrite.h"
 
 static int h263_handle_packet(AVFormatContext *ctx,

Modified: trunk/libavformat/rtpdec_h264.c
==============================================================================
--- trunk/libavformat/rtpdec_h264.c	Fri Jul 30 13:56:01 2010	(r24595)
+++ trunk/libavformat/rtpdec_h264.c	Fri Jul 30 14:04:27 2010	(r24596)
@@ -47,7 +47,7 @@
 #include <assert.h>
 
 #include "rtpdec.h"
-#include "rtpdec_h264.h"
+#include "rtpdec_formats.h"
 
 /**
     RTP/H264 specific private data.

Modified: trunk/libavformat/rtpdec_mpeg4.c
==============================================================================
--- trunk/libavformat/rtpdec_mpeg4.c	Fri Jul 30 13:56:01 2010	(r24595)
+++ trunk/libavformat/rtpdec_mpeg4.c	Fri Jul 30 14:04:27 2010	(r24596)
@@ -27,7 +27,7 @@
  * @author Romain Degez
  */
 
-#include "rtpdec_mpeg4.h"
+#include "rtpdec_formats.h"
 #include "internal.h"
 #include "libavutil/avstring.h"
 #include "libavcodec/get_bits.h"

Modified: trunk/libavformat/rtpdec_qdm2.c
==============================================================================
--- trunk/libavformat/rtpdec_qdm2.c	Fri Jul 30 13:56:01 2010	(r24595)
+++ trunk/libavformat/rtpdec_qdm2.c	Fri Jul 30 14:04:27 2010	(r24596)
@@ -30,7 +30,7 @@
 #include "libavcodec/avcodec.h"
 #include "rtp.h"
 #include "rtpdec.h"
-#include "rtpdec_qdm2.h"
+#include "rtpdec_formats.h"
 
 struct PayloadContext {
     /** values read from the config header, used as packet headers */

Modified: trunk/libavformat/rtpdec_svq3.c
==============================================================================
--- trunk/libavformat/rtpdec_svq3.c	Fri Jul 30 13:56:01 2010	(r24595)
+++ trunk/libavformat/rtpdec_svq3.c	Fri Jul 30 14:04:27 2010	(r24596)
@@ -30,7 +30,7 @@
 #include "libavutil/intreadwrite.h"
 #include "rtp.h"
 #include "rtpdec.h"
-#include "rtpdec_svq3.h"
+#include "rtpdec_formats.h"
 
 struct PayloadContext {
     ByteIOContext *pktbuf;

Modified: trunk/libavformat/rtpdec_xiph.c
==============================================================================
--- trunk/libavformat/rtpdec_xiph.c	Fri Jul 30 13:56:01 2010	(r24595)
+++ trunk/libavformat/rtpdec_xiph.c	Fri Jul 30 14:04:27 2010	(r24596)
@@ -34,7 +34,7 @@
 #include <assert.h>
 
 #include "rtpdec.h"
-#include "rtpdec_xiph.h"
+#include "rtpdec_formats.h"
 
 /**
  * RTP/Xiph specific private data.

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Fri Jul 30 13:56:01 2010	(r24595)
+++ trunk/libavformat/rtsp.c	Fri Jul 30 14:04:27 2010	(r24596)
@@ -38,7 +38,7 @@
 
 #include "rtpdec.h"
 #include "rdt.h"
-#include "rtpdec_asf.h"
+#include "rtpdec_formats.h"
 
 //#define DEBUG
 //#define DEBUG_RTP_TCP



More information about the ffmpeg-cvslog mailing list