From e36f22dbc497d37e01d9bdae7bd717b55142b5e6 Mon Sep 17 00:00:00 2001
From: Michael Roitzsch <mroi@users.sourceforge.net>
Date: Sat, 7 Sep 2002 20:09:28 +0000
Subject: one more 'const' and independent x/y zooming parameters

CVS patchset: 2625
CVS date: 2002/09/07 20:09:28
---
 include/xine.h.in               | 11 ++++++-----
 src/demuxers/demux_mpeg_block.c |  6 ++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/include/xine.h.in b/include/xine.h.in
index e6d4eaa27..a37486089 100644
--- a/include/xine.h.in
+++ b/include/xine.h.in
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine.h.in,v 1.7 2002/09/06 18:13:10 mroi Exp $
+ * $Id: xine.h.in,v 1.8 2002/09/07 20:09:28 mroi Exp $
  *
  * public xine-lib (libxine) interface and documentation
  *
@@ -351,9 +351,10 @@ int xine_register_report_codec_cb(xine_p self,
 #define XINE_PARAM_VO_SATURATION           0x01000004
 #define XINE_PARAM_VO_CONTRAST             0x01000005
 #define XINE_PARAM_VO_BRIGHTNESS           0x01000006
-#define XINE_PARAM_VO_ZOOM                 0x01000007
-#define XINE_PARAM_VO_PAN_SCAN             0x01000008         
-#define XINE_PARAM_VO_TVMODE               0x01000009
+#define XINE_PARAM_VO_ZOOM_X               0x01000007
+#define XINE_PARAM_VO_ZOOM_Y               0x01000008
+#define XINE_PARAM_VO_PAN_SCAN             0x01000009         
+#define XINE_PARAM_VO_TVMODE               0x0100000a
 
 #define XINE_VO_ZOOM_STEP                  100
 #define XINE_VO_ZOOM_MAX                   400
@@ -825,7 +826,7 @@ typedef struct {
  */
 typedef struct {
   xine_event_t     event;
-  char            *mrl;
+  const char      *mrl;
   int              handled;
 } xine_next_mrl_event_t;
 
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index e3421fbf1..dda24484e 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg_block.c,v 1.112 2002/09/05 22:18:52 mroi Exp $
+ * $Id: demux_mpeg_block.c,v 1.113 2002/09/07 20:09:28 mroi Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  *
@@ -183,7 +183,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
 
     if (event.handled) {
 
-      char *next_mrl = event.mrl;
+      char *next_mrl = strdup(event.mrl);
 
 #ifdef LOG      
       printf ("demux_mpeg_block: checking if we can branch to %s\n", next_mrl);
@@ -199,6 +199,8 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
 	this->input->close (this->input);
         this->input->open (this->input, next_mrl);
 
+	free(next_mrl);
+
 	event.event.type = XINE_EVENT_BRANCHED;
 	xine_send_event (this->xine, &event.event);
 	
-- 
cgit v1.2.3