[SCM] libav/experimental: Fix warnings about implicit function declaration when compiling rtpdec.c

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9125806e349e6b4de23f9218c156f7f510cc2d73
Author: Alexis Ballier <alexis.ballier at gmail.com>
Date:   Mon Feb 1 23:10:04 2010 +0000

    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

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 66cf916..f20c363 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -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 */
 
-MpegTSContext *mpegts_parse_open(AVFormatContext *s)
+MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s)
 {
     MpegTSContext *ts;
 
@@ -1705,7 +1705,7 @@ MpegTSContext *mpegts_parse_open(AVFormatContext *s)
 
 /* 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 *ts, AVPacket *pkt,
     return len1 - len;
 }
 
-void mpegts_parse_close(MpegTSContext *ts)
+void ff_mpegts_parse_close(MpegTSContext *ts)
 {
     int i;
 
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 6887341..6be9b73 100644
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -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 */
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index bacfc9a..1498b06 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -291,7 +291,7 @@ RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *r
     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, AVPacket *pkt,
             // 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, AVPacket *pkt,
 
     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);
 }

-- 
Libav/FFmpeg packaging