[FFmpeg-cvslog] r21601 - in trunk/libavformat: mpegts.c mpegts.h rtpdec.c
cehoyos
subversion
Tue Feb 2 00:10:04 CET 2010
Author: cehoyos
Date: Tue Feb 2 00:10:04 2010
New Revision: 21601
Log:
Fix warnings about implicit function declaration when compiling rtpdec.c
Patch by Alexis Ballier, alexis D ballier A gmail
Modified:
trunk/libavformat/mpegts.c
trunk/libavformat/mpegts.h
trunk/libavformat/rtpdec.c
Modified: trunk/libavformat/mpegts.c
==============================================================================
--- trunk/libavformat/mpegts.c Mon Feb 1 23:23:17 2010 (r21600)
+++ trunk/libavformat/mpegts.c Tue Feb 2 00:10:04 2010 (r21601)
@@ -1689,7 +1689,7 @@ static int read_seek(AVFormatContext *s,
/**************************************************************/
/* parsing functions - called from other demuxers such as RTP */
-MpegTSContext *mpegts_parse_open(AVFormatContext *s)
+MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s)
{
MpegTSContext *ts;
@@ -1705,7 +1705,7 @@ MpegTSContext *mpegts_parse_open(AVForma
/* return the consumed length if a packet was output, or -1 if no
packet is output */
-int mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
+int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
const uint8_t *buf, int len)
{
int len1;
@@ -1730,7 +1730,7 @@ int mpegts_parse_packet(MpegTSContext *t
return len1 - len;
}
-void mpegts_parse_close(MpegTSContext *ts)
+void ff_mpegts_parse_close(MpegTSContext *ts)
{
int i;
Modified: trunk/libavformat/mpegts.h
==============================================================================
--- trunk/libavformat/mpegts.h Mon Feb 1 23:23:17 2010 (r21600)
+++ trunk/libavformat/mpegts.h Tue Feb 2 00:10:04 2010 (r21601)
@@ -56,4 +56,11 @@
#define STREAM_TYPE_AUDIO_AC3 0x81
#define STREAM_TYPE_AUDIO_DTS 0x8a
+typedef struct MpegTSContext MpegTSContext;
+
+MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s);
+int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
+ const uint8_t *buf, int len);
+void ff_mpegts_parse_close(MpegTSContext *ts);
+
#endif /* AVFORMAT_MPEGTS_H */
Modified: trunk/libavformat/rtpdec.c
==============================================================================
--- trunk/libavformat/rtpdec.c Mon Feb 1 23:23:17 2010 (r21600)
+++ trunk/libavformat/rtpdec.c Tue Feb 2 00:10:04 2010 (r21601)
@@ -291,7 +291,7 @@ RTPDemuxContext *rtp_parse_open(AVFormat
s->rtp_payload_data = rtp_payload_data;
rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp?
if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) {
- s->ts = mpegts_parse_open(s->ic);
+ s->ts = ff_mpegts_parse_open(s->ic);
if (s->ts == NULL) {
av_free(s);
return NULL;
@@ -424,7 +424,7 @@ int rtp_parse_packet(RTPDemuxContext *s,
// TODO: Move to a dynamic packet handler (like above)
if (s->read_buf_index >= s->read_buf_size)
return -1;
- ret = mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index,
+ ret = ff_mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index,
s->read_buf_size - s->read_buf_index);
if (ret < 0)
return -1;
@@ -473,7 +473,7 @@ int rtp_parse_packet(RTPDemuxContext *s,
if (!st) {
/* specific MPEG2TS demux support */
- ret = mpegts_parse_packet(s->ts, pkt, buf, len);
+ ret = ff_mpegts_parse_packet(s->ts, pkt, buf, len);
if (ret < 0)
return -1;
if (ret < len) {
@@ -560,7 +560,7 @@ void rtp_parse_close(RTPDemuxContext *s)
{
// TODO: fold this into the protocol specific data fields.
if (!strcmp(ff_rtp_enc_name(s->payload_type), "MP2T")) {
- mpegts_parse_close(s->ts);
+ ff_mpegts_parse_close(s->ts);
}
av_free(s);
}
More information about the ffmpeg-cvslog
mailing list