Skip to content
Snippets Groups Projects
Commit 9125806e authored by Alexis Ballier's avatar Alexis Ballier Committed by Carl Eugen Hoyos
Browse files

Fix warnings about implicit function declaration when compiling rtpdec.c

Patch by Alexis Ballier, alexis D ballier A gmail

Originally committed as revision 21601 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ecbed31c
No related branches found
No related tags found
No related merge requests found
...@@ -1689,7 +1689,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t target_ts, in ...@@ -1689,7 +1689,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t target_ts, in
/**************************************************************/ /**************************************************************/
/* parsing functions - called from other demuxers such as RTP */ /* parsing functions - called from other demuxers such as RTP */
MpegTSContext *mpegts_parse_open(AVFormatContext *s) MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s)
{ {
MpegTSContext *ts; MpegTSContext *ts;
...@@ -1705,7 +1705,7 @@ MpegTSContext *mpegts_parse_open(AVFormatContext *s) ...@@ -1705,7 +1705,7 @@ MpegTSContext *mpegts_parse_open(AVFormatContext *s)
/* return the consumed length if a packet was output, or -1 if no /* return the consumed length if a packet was output, or -1 if no
packet is output */ 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) const uint8_t *buf, int len)
{ {
int len1; int len1;
...@@ -1730,7 +1730,7 @@ int mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, ...@@ -1730,7 +1730,7 @@ int mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
return len1 - len; return len1 - len;
} }
void mpegts_parse_close(MpegTSContext *ts) void ff_mpegts_parse_close(MpegTSContext *ts)
{ {
int i; int i;
......
...@@ -56,4 +56,11 @@ ...@@ -56,4 +56,11 @@
#define STREAM_TYPE_AUDIO_AC3 0x81 #define STREAM_TYPE_AUDIO_AC3 0x81
#define STREAM_TYPE_AUDIO_DTS 0x8a #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 */ #endif /* AVFORMAT_MPEGTS_H */
...@@ -291,7 +291,7 @@ RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *r ...@@ -291,7 +291,7 @@ RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *r
s->rtp_payload_data = rtp_payload_data; s->rtp_payload_data = rtp_payload_data;
rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp? rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp?
if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) { 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) { if (s->ts == NULL) {
av_free(s); av_free(s);
return NULL; return NULL;
...@@ -424,7 +424,7 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, ...@@ -424,7 +424,7 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
// TODO: Move to a dynamic packet handler (like above) // TODO: Move to a dynamic packet handler (like above)
if (s->read_buf_index >= s->read_buf_size) if (s->read_buf_index >= s->read_buf_size)
return -1; 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); s->read_buf_size - s->read_buf_index);
if (ret < 0) if (ret < 0)
return -1; return -1;
...@@ -473,7 +473,7 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, ...@@ -473,7 +473,7 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
if (!st) { if (!st) {
/* specific MPEG2TS demux support */ /* 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) if (ret < 0)
return -1; return -1;
if (ret < len) { if (ret < len) {
...@@ -560,7 +560,7 @@ void rtp_parse_close(RTPDemuxContext *s) ...@@ -560,7 +560,7 @@ void rtp_parse_close(RTPDemuxContext *s)
{ {
// TODO: fold this into the protocol specific data fields. // TODO: fold this into the protocol specific data fields.
if (!strcmp(ff_rtp_enc_name(s->payload_type), "MP2T")) { if (!strcmp(ff_rtp_enc_name(s->payload_type), "MP2T")) {
mpegts_parse_close(s->ts); ff_mpegts_parse_close(s->ts);
} }
av_free(s); av_free(s);
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment