Mercurial > libavformat.hg
changeset 4389:25430a31705d libavformat
Merge rtp_aac.h and rtp_mpv.h in rtpenc.h
| author | lucabe |
|---|---|
| date | Fri, 06 Feb 2009 15:30:41 +0000 |
| parents | 80f21f72d7d6 |
| children | 5b0645175029 |
| files | rtp_aac.c rtp_aac.h rtp_mpv.h rtpenc.c rtpenc.h |
| diffstat | 5 files changed, 2 insertions(+), 58 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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 */
--- 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 */
--- 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
--- 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 */