# HG changeset patch
# User lucabe
# Date 1233934241 0
# Node ID 25430a31705d29b4788ef3128b43b1e8c031cc7d
# Parent  80f21f72d7d6f1252f8b3e611ae2c760f480db9b
Merge rtp_aac.h and rtp_mpv.h in rtpenc.h

diff -r 80f21f72d7d6 -r 25430a31705d rtp_aac.c
--- a/rtp_aac.c	Fri Feb 06 10:35:52 2009 +0000
+++ b/rtp_aac.c	Fri Feb 06 15:30:41 2009 +0000
@@ -19,7 +19,6 @@
  */
 
 #include "avformat.h"
-#include "rtp_aac.h"
 #include "rtpenc.h"
 
 #define MAX_FRAMES_PER_PACKET (s->max_frames_per_packet ? s->max_frames_per_packet : 5)
diff -r 80f21f72d7d6 -r 25430a31705d rtp_aac.h
--- a/rtp_aac.h	Fri Feb 06 10:35:52 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * RTP definitions
- *
- * 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_RTP_AAC_H
-#define AVFORMAT_RTP_AAC_H
-
-#include "avformat.h"
-
-void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size);
-
-#endif /* AVFORMAT_RTP_AAC_H */
diff -r 80f21f72d7d6 -r 25430a31705d rtp_mpv.h
--- a/rtp_mpv.h	Fri Feb 06 10:35:52 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * RTP definitions
- *
- * 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_RTP_MPV_H
-#define AVFORMAT_RTP_MPV_H
-
-#include "avformat.h"
-
-void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size);
-
-#endif /* AVFORMAT_RTP_MPV_H */
diff -r 80f21f72d7d6 -r 25430a31705d rtpenc.c
--- a/rtpenc.c	Fri Feb 06 10:35:52 2009 +0000
+++ b/rtpenc.c	Fri Feb 06 15:30:41 2009 +0000
@@ -27,9 +27,6 @@
 #include "network.h"
 
 #include "rtpenc.h"
-#include "rtp_mpv.h"
-#include "rtp_aac.h"
-#include "rtp_h264.h"
 
 //#define DEBUG
 
diff -r 80f21f72d7d6 -r 25430a31705d rtpenc.h
--- a/rtpenc.h	Fri Feb 06 10:35:52 2009 +0000
+++ b/rtpenc.h	Fri Feb 06 15:30:41 2009 +0000
@@ -57,5 +57,7 @@
 void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m);
 
 void ff_rtp_send_h264(AVFormatContext *s1, const uint8_t *buf1, int size);
+void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size);
+void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size);
 
 #endif /* AVFORMAT_RTPENC_H */