Update internal (and messy) copies to libcdio 0.71 and

vcdimager 0.7.21.

CVS patchset: 7313
CVS date: 2005/01/01 02:43:56

1 files changed, 18 insertions, 18 deletions

diff --git a/src/input/vcd/libvcd/mpeg_stream.c b/src/input/vcd/libvcd/mpeg_stream.c
index 4fcc1fa8b..e5466766a 100644
--- a/src/input/vcd/libvcd/mpeg_stream.c
+++ b/src/input/vcd/libvcd/mpeg_stream.c
@@ -1,7 +1,7 @@
 /*
-    $Id: mpeg_stream.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
+    $Id: mpeg_stream.c,v 1.3 2005/01/01 02:43:59 rockyb Exp $
 
-    Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+    Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,18 +27,18 @@
 #include <stdlib.h>
 
 #include <cdio/cdio.h>
+#include <cdio/bytesex.h>
 
 #include <libvcd/logging.h>
 
 /* Private headers */
 #include "vcd_assert.h"
 #include "mpeg_stream.h"
-#include "bytesex.h"
 #include "data_structures.h"
 #include "mpeg.h"
 #include "util.h"
 
-static const char _rcsid[] = "$Id: mpeg_stream.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
+static const char _rcsid[] = "$Id: mpeg_stream.c,v 1.3 2005/01/01 02:43:59 rockyb Exp $";
 
 struct _VcdMpegSource
 {
@@ -83,7 +83,7 @@ vcd_mpeg_source_destroy (VcdMpegSource *obj, bool destroy_file_obj)
 
   for (i = 0; i < 3; i++)
     if (obj->info.shdr[i].aps_list)
-      _vcd_list_free (obj->info.shdr[i].aps_list, true);
+      _cdio_list_free (obj->info.shdr[i].aps_list, true);
 
   free (obj);
 }
@@ -117,7 +117,7 @@ vcd_mpeg_source_scan (VcdMpegSource *obj, bool strict_aps, bool fix_scan_info,
   unsigned padbytes = 0;
   unsigned padpackets = 0;
   VcdMpegStreamCtx state;
-  VcdListNode *n;
+  CdioListNode *n;
   vcd_mpeg_prog_info_t _progress = { 0, };
 
   vcd_assert (obj != NULL);
@@ -194,9 +194,9 @@ vcd_mpeg_source_scan (VcdMpegSource *obj, bool strict_aps, bool fix_scan_info,
             _data->timestamp = state.packet.aps_pts;
 
             if (!state.stream.shdr[state.packet.aps_idx].aps_list)
-              state.stream.shdr[state.packet.aps_idx].aps_list = _vcd_list_new ();
+              state.stream.shdr[state.packet.aps_idx].aps_list = _cdio_list_new ();
             
-            _vcd_list_append (state.stream.shdr[state.packet.aps_idx].aps_list, _data);
+            _cdio_list_append (state.stream.shdr[state.packet.aps_idx].aps_list, _data);
           }
           break;
 
@@ -251,9 +251,9 @@ vcd_mpeg_source_scan (VcdMpegSource *obj, bool strict_aps, bool fix_scan_info,
 
     for (i = 0; i < 3; i++)
       if (obj->info.shdr[i].aps_list)
-        _VCD_LIST_FOREACH (n, obj->info.shdr[i].aps_list)
+        _CDIO_LIST_FOREACH (n, obj->info.shdr[i].aps_list)
         {
-          struct aps_data *_data = _vcd_list_node_data (n);
+          struct aps_data *_data = _cdio_list_node_data (n);
           
           _data->timestamp -= obj->info.min_pts; 
         }
@@ -268,18 +268,18 @@ vcd_mpeg_source_scan (VcdMpegSource *obj, bool strict_aps, bool fix_scan_info,
 }
 
 static double
-_approx_pts (VcdList *aps_list, uint32_t packet_no)
+_approx_pts (CdioList *aps_list, uint32_t packet_no)
 {
   double retval = 0;
-  VcdListNode *node;
+  CdioListNode *node;
 
   struct aps_data *_laps = NULL;
 
   double last_pts_ratio = 0;
 
-  _VCD_LIST_FOREACH (node, aps_list)
+  _CDIO_LIST_FOREACH (node, aps_list)
     {
-      struct aps_data *_aps = _vcd_list_node_data (node);
+      struct aps_data *_aps = _cdio_list_node_data (node);
 
       if (_laps)
         {
@@ -322,14 +322,14 @@ _set_scan_msf (msf_t *_msf, long lsn)
 
 static void 
 _fix_scan_info (struct vcd_mpeg_scan_data_t *scan_data_ptr,
-                unsigned packet_no, double pts, VcdList *aps_list)
+                unsigned packet_no, double pts, CdioList *aps_list)
 {
-  VcdListNode *node;
+  CdioListNode *node;
   long _next = -1, _prev = -1, _forw = -1, _back = -1;
 
-  _VCD_LIST_FOREACH (node, aps_list)
+  _CDIO_LIST_FOREACH (node, aps_list)
     {
-      struct aps_data *_aps = _vcd_list_node_data (node);
+      struct aps_data *_aps = _cdio_list_node_data (node);
 
       if (_aps->packet_no == packet_no)
         continue;