Merge rtp_aac.h and rtp_mpv.h in rtpenc.h

Originally committed as revision 17020 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/rtp_aac.c

@@ -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)

libavformat/rtp_aac.h

-/*
- * 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 */

libavformat/rtp_mpv.h

-/*
- * 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 */

libavformat/rtpenc.c

@@ -27,9 +27,6 @@
 #include "network.h"
 
 #include "rtpenc.h"
-#include "rtp_mpv.h"
-#include "rtp_aac.h"
-#include "rtp_h264.h"
 
 //#define DEBUG
 

libavformat/rtpenc.h

@@ -57,5 +57,7 @@ typedef struct RTPMuxContext RTPMuxContext;
 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 */