[mythtv] call for patchs

Tony Clark tclark at telia.com
Sat Oct 23 09:51:15 UTC 2004


Here is a patch to fix cvs compile problem with gcc-3.4.  I've also tested 
with gcc-3.3 and it seems ok.

Tony

Index: libs/libavformat/mpegts.c
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libavformat/mpegts.c,v
retrieving revision 1.20
diff -u -3 -p -u -r1.20 mpegts.c
--- libs/libavformat/mpegts.c 22 Oct 2004 09:56:15 -0000 1.20
+++ libs/libavformat/mpegts.c 23 Oct 2004 09:42:12 -0000
@@ -157,6 +157,23 @@ static void write_section_data(AVFormatC
     }
 }
 
+void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter)
+{
+    int pid;
+
+    if (!ts || !filter)
+        return;
+    pid = filter->pid;
+    if (filter->type == MPEGTS_SECTION)
+        av_freep(&filter->u.section_filter.section_buf);
+    else if (filter->type == MPEGTS_PES)
+        av_freep(&filter->u.pes_filter.opaque);
+
+    av_free(filter);
+    ts->pids[pid] = NULL;
+}
+
+
 MpegTSFilter *mpegts_open_section_filter(MpegTSContext *ts, unsigned int pid, 
                                          SectionCallback *section_cb, void 
*opaque,
                                          int check_crc)
@@ -219,21 +236,6 @@ MpegTSFilter *mpegts_open_pes_filter(Mpe
     return filter;
 }
 
-void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter)
-{
-    int pid;
-
-    if (!ts || !filter)
-        return;
-    pid = filter->pid;
-    if (filter->type == MPEGTS_SECTION)
-        av_freep(&filter->u.section_filter.section_buf);
-    else if (filter->type == MPEGTS_PES)
-        av_freep(&filter->u.pes_filter.opaque);
-
-    av_free(filter);
-    ts->pids[pid] = NULL;
-}
 
 static int analyze(const uint8_t *buf, int size, int packet_size, int *index)
{
     int stat[packet_size];
@@ -736,15 +738,6 @@ static int64_t get_pts(const uint8_t *p)
     return pts;
 }
 
-static void create_stream(PESContext *pes, int code)
-{
-    pes->st = av_new_stream(pes->stream, pes->pid);
-    if (pes->st) {
-        init_stream(pes->st, pes->stream_type, code);
-        pes->st->priv_data = pes;
-        pes->st->need_parsing = 1;
-    }
-}
 
 static void init_stream(AVStream *st, int stream_type, int code)
 {
@@ -798,6 +791,17 @@ static void init_stream(AVStream *st, in
     av_set_pts_info(st, 60, 1, 90000);
 }
 
+static void create_stream(PESContext *pes, int code)
+{
+    pes->st = av_new_stream(pes->stream, pes->pid);
+    if (pes->st) {
+        init_stream(pes->st, pes->stream_type, code);
+        pes->st->priv_data = pes;
+        pes->st->need_parsing = 1;
+    }
+}
+
+
 /* return non zero if a packet could be constructed */
 static void mpegts_push_data(void *opaque,
                              const uint8_t *buf, int buf_size, int is_start,

-------------- next part --------------
A non-text attachment was scrubbed...
Name: mpegts.patch
Type: text/x-diff
Size: 2605 bytes
Desc: not available
Url : http://mythtv.org/pipermail/mythtv-dev/attachments/20041023/b4c3b15b/mpegts.bin


More information about the mythtv-dev mailing list