virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

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

Browse Source 
Originally committed as revision 17020 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Abeni 2009-02-06 15:30:41 +00:00
parent 271e6ddd4a
commit 17a5894a23
5 changed files with 2 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/rtp_aac.c
View File

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

27
libavformat/rtp_aac.h
View File

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

27
libavformat/rtp_mpv.h
View File

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

3
libavformat/rtpenc.c
View File

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

2
libavformat/rtpenc.h
View File

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