rpms/gstreamer-plugins-flumpegdemux/F-12 gst-fmd-update-from-bad.patch, 1.1, 1.2 gstreamer-plugins-flumpegdemux.spec, 1.8, 1.9

Bastien Nocera hadess at fedoraproject.org
Thu Oct 22 14:44:30 UTC 2009


Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26556

Modified Files:
	gst-fmd-update-from-bad.patch 
	gstreamer-plugins-flumpegdemux.spec 
Log Message:
* Thu Oct 22 2009 Bastien Nocera <bnocera at redhat.com> 0.10.15-8
- Update code from gst-plugins-bad


gst-fmd-update-from-bad.patch:
 configure.ac             |    2 
 src/Makefile.am          |   15 
 src/flumpegdemux.c       |   40 
 src/flutspatinfo.c       |   76 -
 src/flutspatinfo.h       |   39 
 src/flutspmtinfo.c       |  171 +--
 src/flutspmtinfo.h       |   47 
 src/flutspmtstreaminfo.c |  174 +--
 src/flutspmtstreaminfo.h |   47 
 src/gstmpegdefs.h        |   98 +
 src/gstmpegdemux.c       | 1803 ++++++++++++++++++++++++++++-----
 src/gstmpegdemux.h       |  139 +-
 src/gstmpegdesc.c        |   60 +
 src/gstmpegdesc.h        |   94 +
 src/gstmpegtsdemux.c     | 1749 +++++++++++++++++++++++---------
 src/gstmpegtsdemux.h     |  286 +++--
 src/gstpesfilter.c       |  165 +--
 src/gstpesfilter.h       |   27 
 src/gstsectionfilter.c   |  149 +-
 src/gstsectionfilter.h   |   26 
 src/mpegtspacketizer.c   | 2506 +++++++++++++++++++++++++++++++++++++++++++++++
 src/mpegtspacketizer.h   |  152 ++
 src/mpegtsparse.c        | 1342 +++++++++++++++++++++++++
 src/mpegtsparse.h        |   85 +
 24 files changed, 7954 insertions(+), 1338 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 gst-fmd-update-from-bad.patchIndex: gst-fmd-update-from-bad.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/F-12/gst-fmd-update-from-bad.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gst-fmd-update-from-bad.patch	1 Apr 2009 12:20:07 -0000	1.1
+++ gst-fmd-update-from-bad.patch	22 Oct 2009 14:44:29 -0000	1.2
@@ -1,6 +1,6 @@
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/configure.ac gst-fluendo-mpegdemux-0.10.15/configure.ac
 --- gst-fluendo-mpegdemux-0.10.15.old/configure.ac	2008-02-13 18:14:54.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/configure.ac	2009-04-01 12:39:32.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/configure.ac	2009-10-22 15:36:25.000000000 +0100
 @@ -76,6 +76,8 @@ AC_SUBST(GST_CFLAGS)
  AC_SUBST(GST_LIBS)
  AC_SUBST(GST_BASE_LIBS)
@@ -12,7 +12,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flumpegdemux.c gst-fluendo-mpegdemux-0.10.15/src/flumpegdemux.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flumpegdemux.c	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flumpegdemux.c	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flumpegdemux.c	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -89,7 +89,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.c gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.c	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.c	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.c	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -226,7 +226,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
      case PROP_PROGRAM_NO:
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.h gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.h	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.h	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.h	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -295,7 +295,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtinfo.c gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtinfo.c	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.c	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.c	2009-04-01 12:36:31.000000000 +0100
 @@ -1,22 +1,45 @@
 -/* 
 - * The contents of this file are subject to the Mozilla Public License
@@ -559,7 +559,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
    g_value_take_object (&v, stream);
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtinfo.h gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtinfo.h	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.h	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.h	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 + /*
@@ -640,7 +640,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtstreaminfo.c gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtstreaminfo.c	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.c	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.c	2009-04-01 12:36:31.000000000 +0100
 @@ -1,22 +1,45 @@
 -/* 
 - * The contents of this file are subject to the Mozilla Public License
@@ -900,7 +900,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 -
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtstreaminfo.h gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtstreaminfo.h	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.h	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.h	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -982,7 +982,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/gstmpegdefs.h gst-fluendo-mpegdemux-0.10.15/src/gstmpegdefs.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/gstmpegdefs.h	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/gstmpegdefs.h	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/gstmpegdefs.h	2009-09-15 16:41:00.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -1027,28 +1027,103 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
  /* Stream type assignments
   * 
-@@ -166,6 +190,17 @@
+@@ -123,30 +147,53 @@
+  * 0x0F-0x7F ITU-T Rec. H.222.0 | ISO/IEC 13818-1 Reserved
+  * 0x80-0xFF User Private
+  */
+-#define ST_RESERVED			0x00
+-#define ST_VIDEO_MPEG1			0x01
+-#define ST_VIDEO_MPEG2			0x02
+-#define ST_AUDIO_MPEG1			0x03
+-#define ST_AUDIO_MPEG2			0x04
+-#define ST_PRIVATE_SECTIONS		0x05
+-#define ST_PRIVATE_DATA			0x06
+-#define ST_MHEG				0x07
+-#define ST_DSMCC			0x08
+-#define ST_H222_1			0x09
++#define ST_RESERVED                     0x00
++#define ST_VIDEO_MPEG1                  0x01
++#define ST_VIDEO_MPEG2                  0x02
++#define ST_AUDIO_MPEG1                  0x03
++#define ST_AUDIO_MPEG2                  0x04
++#define ST_PRIVATE_SECTIONS             0x05
++#define ST_PRIVATE_DATA                 0x06
++#define ST_MHEG                         0x07
++#define ST_DSMCC                        0x08
++#define ST_H222_1                       0x09
+ 
+ /* later extensions */
+-#define ST_AUDIO_AAC			0x0f
+-#define ST_VIDEO_MPEG4			0x10
+-#define ST_VIDEO_H264			0x1b
++#define ST_AUDIO_AAC                    0x0f
++#define ST_VIDEO_MPEG4                  0x10
++#define ST_VIDEO_H264                   0x1b
+ 
+ /* Un-official Dirac extension */
+-#define ST_VIDEO_DIRAC			0xd1
++#define ST_VIDEO_DIRAC                  0xd1
+ 
+ /* private stream types */
+-#define ST_PS_AUDIO_AC3			0x81
+-#define ST_PS_AUDIO_DTS			0x8a
+-#define ST_PS_AUDIO_LPCM		0x8b
++#define ST_PS_AUDIO_AC3                 0x81
++#define ST_PS_AUDIO_DTS                 0x8a
++#define ST_PS_AUDIO_LPCM                0x8b
+ #define ST_PS_DVD_SUBPICTURE            0xff
++/* Blu-ray related */
++#define ST_BD_AUDIO_LPCM                0x80
++#define ST_BD_AUDIO_AC3                 0x81
++#define ST_BD_AUDIO_DTS                 0x82
++#define ST_BD_AUDIO_AC3_TRUE_HD         0x83
++#define ST_BD_AUDIO_AC3_PLUS            0x84
++#define ST_BD_AUDIO_DTS_HD              0x85
++#define ST_BD_AUDIO_EAC3                0x87
++#define ST_BD_PGS_SUBPICTURE            0x90
++#define ST_BD_IGS                       0x91
++#define ST_BD_SUBTITLE                  0x92
++#define ST_BD_SECONDARY_AC3_PLUS        0xa1
++#define ST_BD_SECONDARY_DTS_HD          0xa2
++
++/* defined for VC1 extension in RP227 */
++#define ST_PRIVATE_EA                   0xea
++
++/* HDV AUX stream mapping
++ * 0xA0      ISO/IEC 61834-11
++ * 0xA1      ISO/IEC 61834-11
++ */
++#define ST_HDV_AUX_A                    0xa0
++#define ST_HDV_AUX_V                    0xa1
+ 
+ /* Un-official time-code stream */
+ #define ST_PS_TIMECODE                  0xd2
+@@ -166,8 +213,19 @@
  
  #define MPEG_MUX_RATE_MULT      50
  
 +/* sync:4 == 00xx ! pts:3 ! 1 ! pts:15 ! 1 | pts:15 ! 1 */
 +#define READ_TS(data, target, lost_sync_label)          \
 +    if ((*data & 0x01) != 0x01) goto lost_sync_label;   \
-+    target  = ((guint64) (*data++ & 0x0E)) << 29;	\
-+    target |= ((guint64) (*data++       )) << 22;	\
++    target  = ((guint64) (*data++ & 0x0E)) << 29;       \
++    target |= ((guint64) (*data++       )) << 22;       \
 +    if ((*data & 0x01) != 0x01) goto lost_sync_label;   \
-+    target |= ((guint64) (*data++ & 0xFE)) << 14;	\
-+    target |= ((guint64) (*data++       )) << 7;	\
++    target |= ((guint64) (*data++ & 0xFE)) << 14;       \
++    target |= ((guint64) (*data++       )) << 7;        \
 +    if ((*data & 0x01) != 0x01) goto lost_sync_label;   \
 +    target |= ((guint64) (*data++ & 0xFE)) >> 1;
 +
  /* some extra GstFlowReturn values used internally */
- #define GST_FLOW_NEED_MORE_DATA		-100
- #define GST_FLOW_LOST_SYNC		-101
+-#define GST_FLOW_NEED_MORE_DATA		-100
+-#define GST_FLOW_LOST_SYNC		-101
++#define GST_FLOW_NEED_MORE_DATA   -100
++#define GST_FLOW_LOST_SYNC        -101
+ 
+ #endif /* __GST_MPEG_DEFS_H__ */
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/gstmpegdemux.c gst-fluendo-mpegdemux-0.10.15/src/gstmpegdemux.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/gstmpegdemux.c	2008-02-13 18:07:07.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/gstmpegdemux.c	2009-04-01 12:37:48.000000000 +0100
-@@ -1,22 +1,45 @@
++++ gst-fluendo-mpegdemux-0.10.15/src/gstmpegdemux.c	2009-10-13 14:27:03.000000000 +0100
+@@ -1,22 +1,46 @@
 -/* 
 - * The contents of this file are subject to the Mozilla Public License
[...6078 lines suppressed...]
 +  GST_OBJECT_UNLOCK (parse);
 +
-+  {
-+    gchar *dbg = gst_structure_to_string (pmt_info);
-+
-+    GST_DEBUG_OBJECT (parse, "new pmt %s", dbg);
-+    g_free (dbg);
-+  }
++  GST_DEBUG_OBJECT (parse, "new pmt %" GST_PTR_FORMAT, pmt_info);
 +
 +  gst_element_post_message (GST_ELEMENT_CAST (parse),
 +      gst_message_new_element (GST_OBJECT (parse),
@@ -9841,8 +11674,8 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  gboolean res = TRUE;
 +  GstStructure *structure = NULL;
 +
-+  if (mpegts_parse_calc_crc32 (GST_BUFFER_DATA (section->buffer),
-+          GST_BUFFER_SIZE (section->buffer)) != 0) {
++  if (G_UNLIKELY (mpegts_parse_calc_crc32 (GST_BUFFER_DATA (section->buffer),
++              GST_BUFFER_SIZE (section->buffer)) != 0)) {
 +    GST_WARNING_OBJECT (parse, "bad crc in psi pid 0x%x", section->pid);
 +    return FALSE;
 +  }
@@ -9851,7 +11684,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    case 0x00:
 +      /* PAT */
 +      structure = mpegts_packetizer_parse_pat (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_pat (parse, structure);
 +      else
 +        res = FALSE;
@@ -9859,7 +11692,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +      break;
 +    case 0x02:
 +      structure = mpegts_packetizer_parse_pmt (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_pmt (parse, section->pid, structure);
 +      else
 +        res = FALSE;
@@ -9870,7 +11703,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    case 0x41:
 +      /* NIT, other network */
 +      structure = mpegts_packetizer_parse_nit (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_nit (parse, section->pid, structure);
 +      else
 +        res = FALSE;
@@ -9879,7 +11712,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    case 0x42:
 +    case 0x46:
 +      structure = mpegts_packetizer_parse_sdt (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_sdt (parse, section->pid, structure);
 +      else
 +        res = FALSE;
@@ -9921,7 +11754,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    case 0x6F:
 +      /* EIT, schedule */
 +      structure = mpegts_packetizer_parse_eit (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_eit (parse, section->pid, structure);
 +      else
 +        res = FALSE;
@@ -9962,6 +11795,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  GstFlowReturn res = GST_FLOW_OK;
 +  MpegTSParse *parse;
 +  gboolean parsed;
++  MpegTSPacketizerPacketReturn pret;
 +  MpegTSPacketizer *packetizer;
 +  MpegTSPacketizerPacket packet;
 +
@@ -9969,11 +11803,10 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  packetizer = parse->packetizer;
 +
 +  mpegts_packetizer_push (parse->packetizer, buf);
-+  while (mpegts_packetizer_has_packets (parse->packetizer) &&
-+      !GST_FLOW_IS_FATAL (res)) {
-+    /* get the next packet */
-+    parsed = mpegts_packetizer_next_packet (packetizer, &packet);
-+    if (!parsed)
++  while (((pret =
++              mpegts_packetizer_next_packet (parse->packetizer,
++                  &packet)) != PACKET_NEED_MORE) && !GST_FLOW_IS_FATAL (res)) {
++    if (G_UNLIKELY (pret == PACKET_BAD))
 +      /* bad header, skip the packet */
 +      goto next;
 +
@@ -9982,16 +11815,16 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +      MpegTSPacketizerSection section;
 +
 +      parsed = mpegts_packetizer_push_section (packetizer, &packet, &section);
-+      if (!parsed)
++      if (G_UNLIKELY (!parsed))
 +        /* bad section data */
 +        goto next;
 +
-+      if (section.complete) {
++      if (G_LIKELY (section.complete)) {
 +        /* section complete */
 +        parsed = mpegts_parse_handle_psi (parse, &section);
 +        gst_buffer_unref (section.buffer);
 +
-+        if (!parsed)
++        if (G_UNLIKELY (!parsed))
 +          /* bad PSI table */
 +          goto next;
 +      }
@@ -10007,6 +11840,9 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    mpegts_packetizer_clear_packet (parse->packetizer, &packet);
 +  }
 +
++  if (parse->need_sync_program_pads)
++    mpegts_parse_sync_program_pads (parse);
++
 +  gst_object_unref (parse);
 +  return res;
 +}
@@ -10059,7 +11895,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    default:
 +      res = gst_pad_query_default (pad, query);
 +  }
-+
++  gst_object_unref (parse);
 +  return res;
 +}
 +
@@ -10069,7 +11905,6 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  GST_DEBUG_CATEGORY_INIT (mpegts_parse_debug, "mpegtsparse", 0,
 +      "MPEG transport stream parser");
 +
-+  mpegts_packetizer_init_debug ();
 +  gst_mpegtsdesc_init_debug ();
 +
 +  return gst_element_register (plugin, "mpegtsparse",
@@ -10077,8 +11912,8 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +}
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/mpegtsparse.h gst-fluendo-mpegdemux-0.10.15/src/mpegtsparse.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/mpegtsparse.h	1970-01-01 01:00:00.000000000 +0100
-+++ gst-fluendo-mpegdemux-0.10.15/src/mpegtsparse.h	2009-04-01 12:37:48.000000000 +0100
-@@ -0,0 +1,83 @@
++++ gst-fluendo-mpegdemux-0.10.15/src/mpegtsparse.h	2009-06-19 10:11:07.000000000 +0100
+@@ -0,0 +1,85 @@
 +/*
 + * mpegts_parse.h - GStreamer MPEG transport stream parser
 + * Copyright (C) 2007 Alessandro Decina
@@ -10141,7 +11976,9 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  GstStructure *pat;
 +  MpegTSPacketizer *packetizer;
 +  GHashTable *psi_pids;
++  GHashTable *pes_pids;
 +  gboolean disposed;
++  gboolean need_sync_program_pads;
 +};
 +
 +struct _MpegTSParseClass {
@@ -10162,39 +11999,3 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +G_END_DECLS
 +
 +#endif /* GST_MPEG_TS_PARSE_H */
---- gst-fluendo-mpegdemux-0.10.15.old/src/Makefile.am	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/Makefile.am	2009-04-01 13:05:25.000000000 +0100
-@@ -1,5 +1,4 @@
--# plugindir is set in configure
--
-+plugindir = $(libdir)/gstreamer-0.10/
- plugin_LTLIBRARIES = libgstflumpegdemux.la
- 
- # for the next set of variables, rename the prefix if you renamed the .la
-@@ -14,12 +13,14 @@ libgstflumpegdemux_la_SOURCES = \
- 	flutspatinfo.c \
- 	flutspmtinfo.c \
- 	flutspmtstreaminfo.c \
--	gstsectionfilter.c
-+	gstsectionfilter.c \
-+	mpegtspacketizer.c \
-+	mpegtsparse.c
- 
- # flags used to compile this plugin
- # we use the GST_LIBS flags because we might be using plug-in libs
--libgstflumpegdemux_la_CFLAGS = $(GST_CFLAGS)
--libgstflumpegdemux_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
-+libgstflumpegdemux_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS) -DGST_PACKAGE_NAME="\"gst-fluendo-mpegdemux from gst-plugins-bad\"" -DGST_PACKAGE_ORIGIN="\"http://download.fedora.redhat.com/fedora\""
-+libgstflumpegdemux_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS)
- libgstflumpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- 
- # headers we need but don't want installed
-@@ -32,5 +33,7 @@ noinst_HEADERS =	\
- 	flutspatinfo.h \
- 	flutspmtinfo.h \
- 	flutspmtstreaminfo.h \
--	gstsectionfilter.h
-+	gstsectionfilter.h \
-+	mpegtspacketizer.h \
-+	mpegtsparse.h
- 


Index: gstreamer-plugins-flumpegdemux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/F-12/gstreamer-plugins-flumpegdemux.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gstreamer-plugins-flumpegdemux.spec	25 Jul 2009 01:36:46 -0000	1.8
+++ gstreamer-plugins-flumpegdemux.spec	22 Oct 2009 14:44:29 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: MPEG demuxer for GStreamer
 Name: gstreamer-plugins-flumpegdemux
 Version: 0.10.15
-Release: 7%{?dist} 
+Release: 8%{?dist}
 License: MPLv1.1
 Group: Applications/Multimedia
 Source0: http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/gst-fluendo-mpegdemux-%{version}.tar.bz2
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libgstmpegdemux.so
 
 %changelog
+* Thu Oct 22 2009 Bastien Nocera <bnocera at redhat.com> 0.10.15-8
+- Update code from gst-plugins-bad
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.15-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list