[SCM] libav/experimental: Remove mostly unnecessary rtpdec_*.h files, store the declarations in one file
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:13:03 UTC 2013
The following commit has been merged in the experimental branch:
commit 965a3ddb1f9cd03f04c631437479460e1a0bdec1
Author: Martin Storsjö <martin at martin.st>
Date: Fri Jul 30 12:04:27 2010 +0000
Remove mostly unnecessary rtpdec_*.h files, store the declarations in one file
Originally committed as revision 24596 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 0e2aebb..c17dc2d 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -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
diff --git a/libavformat/rtpdec_amr.c b/libavformat/rtpdec_amr.c
index 737b411..016d216 100644
--- a/libavformat/rtpdec_amr.c
+++ b/libavformat/rtpdec_amr.c
@@ -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] = {
diff --git a/libavformat/rtpdec_amr.h b/libavformat/rtpdec_amr.h
deleted file mode 100644
index 3cd9dd1..0000000
--- a/libavformat/rtpdec_amr.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * RTP AMR Depacketizer, RFC 3267
- * 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_AMR_H
-#define AVFORMAT_RTPDEC_AMR_H
-
-#include "rtpdec.h"
-
-extern RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler;
-extern RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler;
-
-#endif /* AVFORMAT_RTPDEC_AMR_H */
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c
index d77dadf..56df314 100644
--- a/libavformat/rtpdec_asf.c
+++ b/libavformat/rtpdec_asf.c
@@ -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"
diff --git a/libavformat/rtpdec_asf.h b/libavformat/rtpdec_asf.h
deleted file mode 100644
index dbd85dc..0000000
--- a/libavformat/rtpdec_asf.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Microsoft RTP/ASF support.
- * Copyright (c) 2008 Ronald S. Bultje
- *
- * 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_ASF_H
-#define AVFORMAT_RTPDEC_ASF_H
-
-#include "avformat.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);
-
-/**
- * Handlers for the x-asf-pf payloads (the payload ID for RTP/ASF).
- * Defined and implemented in rtp_asf.c, registered in rtpdec.c.
- */
-extern RTPDynamicProtocolHandler ff_ms_rtp_asf_pfv_handler,
- ff_ms_rtp_asf_pfa_handler;
-
-#endif /* AVFORMAT_RTPDEC_ASF_H */
diff --git a/libavformat/rtpdec_formats.h b/libavformat/rtpdec_formats.h
new file mode 100644
index 0000000..eac1b52
--- /dev/null
+++ b/libavformat/rtpdec_formats.h
@@ -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 */
diff --git a/libavformat/rtpdec_h263.c b/libavformat/rtpdec_h263.c
index 19de6ec..ea42fff 100644
--- a/libavformat/rtpdec_h263.c
+++ b/libavformat/rtpdec_h263.c
@@ -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,
diff --git a/libavformat/rtpdec_h263.h b/libavformat/rtpdec_h263.h
deleted file mode 100644
index 5b51128..0000000
--- a/libavformat/rtpdec_h263.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * RTP H.263 Depacketizer, RFC 4629
- * 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_H263_H
-#define AVFORMAT_RTPDEC_H263_H
-
-#include "rtpdec.h"
-
-extern RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler;
-extern RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler;
-
-#endif /* AVFORMAT_RTPDEC_H263_H */
diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c
index 3ee0788..29705a6 100644
--- a/libavformat/rtpdec_h264.c
+++ b/libavformat/rtpdec_h264.c
@@ -47,7 +47,7 @@
#include <assert.h>
#include "rtpdec.h"
-#include "rtpdec_h264.h"
+#include "rtpdec_formats.h"
/**
RTP/H264 specific private data.
diff --git a/libavformat/rtpdec_h264.h b/libavformat/rtpdec_h264.h
deleted file mode 100644
index b4d54de..0000000
--- a/libavformat/rtpdec_h264.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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 AVFORMAT_RTPDEC_H264_H
-#define AVFORMAT_RTPDEC_H264_H
-
-#include "rtpdec.h"
-
-extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;
-
-#endif /* AVFORMAT_RTPDEC_H264_H */
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c
index 9512752..cf309cd 100644
--- a/libavformat/rtpdec_mpeg4.c
+++ b/libavformat/rtpdec_mpeg4.c
@@ -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"
diff --git a/libavformat/rtpdec_mpeg4.h b/libavformat/rtpdec_mpeg4.h
deleted file mode 100644
index 06d9e57..0000000
--- a/libavformat/rtpdec_mpeg4.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Common code for the RTP depacketization of MPEG-4 formats.
- * Copyright (c) 2010 Fabrice Bellard
- * Romain Degez
- *
- * 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_MPEG4_H
-#define AVFORMAT_RTPDEC_MPEG4_H
-
-#include "rtpdec.h"
-
-/**
- * MPEG-4 Video RTP callbacks. (RFC 3016)
- */
-extern RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler;
-
-/**
- * AAC RTP callbacks. (RFC 3640)
- */
-extern RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler;
-
-#endif /* AVFORMAT_RTPDEC_MPEG4_H */
-
diff --git a/libavformat/rtpdec_qdm2.c b/libavformat/rtpdec_qdm2.c
index 9c6b3ef..e9e221a 100644
--- a/libavformat/rtpdec_qdm2.c
+++ b/libavformat/rtpdec_qdm2.c
@@ -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 */
diff --git a/libavformat/rtpdec_qdm2.h b/libavformat/rtpdec_qdm2.h
deleted file mode 100644
index 6fa1983..0000000
--- a/libavformat/rtpdec_qdm2.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * QDesign Music 2 (QDM2) payload for RTP
- * Copyright (c) 2010 Ronald S. Bultje
- *
- * 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_QDM2_H
-#define AVFORMAT_RTPDEC_QDM2_H
-
-#include "rtpdec.h"
-
-/**
- * QMD2 RTP callbacks.
- */
-extern RTPDynamicProtocolHandler ff_qdm2_dynamic_handler;
-
-#endif /* AVFORMAT_RTPDEC_QDM2_H */
diff --git a/libavformat/rtpdec_svq3.c b/libavformat/rtpdec_svq3.c
index 441ef7a..3c4d75f 100644
--- a/libavformat/rtpdec_svq3.c
+++ b/libavformat/rtpdec_svq3.c
@@ -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;
diff --git a/libavformat/rtpdec_svq3.h b/libavformat/rtpdec_svq3.h
deleted file mode 100644
index 267d4d9..0000000
--- a/libavformat/rtpdec_svq3.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Sorenson-3 (SVQ3/SV3V) payload for RTP
- * Copyright (c) 2010 Ronald S. Bultje
- *
- * 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_SVQ3_H
-#define AVFORMAT_RTPDEC_SVQ3_H
-
-#include "libavcodec/avcodec.h"
-#include "rtpdec.h"
-
-/**
- * Sorenson-3 RTP callbacks.
- */
-extern RTPDynamicProtocolHandler ff_svq3_dynamic_handler;
-
-#endif /* AVFORMAT_RTPDEC_SVQ3_H */
diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c
index 5b75529..4c44c8a 100644
--- a/libavformat/rtpdec_xiph.c
+++ b/libavformat/rtpdec_xiph.c
@@ -34,7 +34,7 @@
#include <assert.h>
#include "rtpdec.h"
-#include "rtpdec_xiph.h"
+#include "rtpdec_formats.h"
/**
* RTP/Xiph specific private data.
diff --git a/libavformat/rtpdec_xiph.h b/libavformat/rtpdec_xiph.h
deleted file mode 100644
index 50aa77f..0000000
--- a/libavformat/rtpdec_xiph.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Xiph RTP Protocols
- * Based off RFC 5215 (Vorbis RTP) and the Theora RTP draft.
- * Copyright (c) 2009 Colin McQuillian
- * Copyright (c) 2010 Josh Allmann
- *
- * 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_XIPH_H
-#define AVFORMAT_RTPDEC_XIPH_H
-
-#include "libavcodec/avcodec.h"
-#include "rtpdec.h"
-
-/**
- * Theora RTP callbacks.
- */
-extern RTPDynamicProtocolHandler ff_theora_dynamic_handler;
-
-/**
- * Vorbis RTP callbacks.
- */
-extern RTPDynamicProtocolHandler ff_vorbis_dynamic_handler;
-
-#endif /* AVFORMAT_RTPDEC_XIPH_H */
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 6ad0953..689ad29 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -38,7 +38,7 @@
#include "rtpdec.h"
#include "rdt.h"
-#include "rtpdec_asf.h"
+#include "rtpdec_formats.h"
//#define DEBUG
//#define DEBUG_RTP_TCP
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list