[FFmpeg-cvslog] r17020 - in trunk/libavformat: rtp_aac.c rtp_aac.h rtp_mpv.h rtpenc.c rtpenc.h

[lucabe]

Author: lucabe
Date: Fri Feb  6 16:30:41 2009
New Revision: 17020

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

Deleted:
   trunk/libavformat/rtp_aac.h
   trunk/libavformat/rtp_mpv.h
Modified:
   trunk/libavformat/rtp_aac.c
   trunk/libavformat/rtpenc.c
   trunk/libavformat/rtpenc.h

Modified: trunk/libavformat/rtp_aac.c
==============================================================================
--- trunk/libavformat/rtp_aac.c	Fri Feb  6 14:04:39 2009	(r17019)
+++ trunk/libavformat/rtp_aac.c	Fri Feb  6 16:30:41 2009	(r17020)
@@ -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)

Modified: trunk/libavformat/rtpenc.c
==============================================================================
--- trunk/libavformat/rtpenc.c	Fri Feb  6 14:04:39 2009	(r17019)
+++ trunk/libavformat/rtpenc.c	Fri Feb  6 16:30:41 2009	(r17020)
@@ -27,9 +27,6 @@
 #include "network.h"
 
 #include "rtpenc.h"
-#include "rtp_mpv.h"
-#include "rtp_aac.h"
-#include "rtp_h264.h"
 
 //#define DEBUG
 

Modified: trunk/libavformat/rtpenc.h
==============================================================================
--- trunk/libavformat/rtpenc.h	Fri Feb  6 14:04:39 2009	(r17019)
+++ trunk/libavformat/rtpenc.h	Fri Feb  6 16:30:41 2009	(r17020)
@@ -57,5 +57,7 @@ typedef struct RTPMuxContext RTPMuxConte
 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 */