xine-lib-1.2@11999

huceke · Jan 12, 2012 · d50c906 · d50c906
1 parent 27b2224
commit d50c906
Show file tree

Hide file tree

Showing 25 changed files with 37 additions and 35 deletions.
diff --git a/po/cs.po b/po/cs.po
@@ -4829,8 +4829,8 @@ msgstr "video_out_xv: Rozšíření Xv není přítomno.\n"
 #: src/video_out/video_out_xcbxv.c:1221 src/video_out/video_out_xv.c:1265
 #: src/video_out/video_out_xxmc.c:2497
 #, c-format
-msgid "%s: could not open Xv port %d - autodetecting\n"
+msgid "%s: could not open Xv port %lu - autodetecting\n"
-msgstr "%s: nepodařilo se otevřít Xv port %d - najde se automaticky\n"
+msgstr "%s: nepodařilo se otevřít Xv port %lu - najde se automaticky\n"
 
 #: src/video_out/video_out_xcbxv.c:1237 src/video_out/video_out_xv.c:1277
 #: src/video_out/video_out_xxmc.c:2509

diff --git a/po/de.po b/po/de.po
@@ -4829,7 +4829,7 @@ msgstr "video_out_xv: Xv-Erweiterung nicht vorhanden.\n"
 #: src/video_out/video_out_xcbxv.c:1221 src/video_out/video_out_xv.c:1265
 #: src/video_out/video_out_xxmc.c:2497
 #, c-format
-msgid "%s: could not open Xv port %d - autodetecting\n"
+msgid "%s: could not open Xv port %lu - autodetecting\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbxv.c:1237 src/video_out/video_out_xv.c:1277

diff --git a/po/en_US.po b/po/en_US.po
@@ -4047,7 +4047,7 @@ msgstr ""
 #: src/video_out/video_out_xcbxv.c:1221 src/video_out/video_out_xv.c:1265
 #: src/video_out/video_out_xxmc.c:2497
 #, c-format
-msgid "%s: could not open Xv port %d - autodetecting\n"
+msgid "%s: could not open Xv port %lu - autodetecting\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbxv.c:1237 src/video_out/video_out_xv.c:1277

diff --git a/po/eo.po b/po/eo.po
@@ -4260,7 +4260,7 @@ msgstr "video_out_xv: Xv-etendilo neĉeestas.\n"
 #: src/video_out/video_out_xcbxv.c:1221 src/video_out/video_out_xv.c:1265
 #: src/video_out/video_out_xxmc.c:2497
 #, c-format
-msgid "%s: could not open Xv port %d - autodetecting\n"
+msgid "%s: could not open Xv port %lu - autodetecting\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbxv.c:1237 src/video_out/video_out_xv.c:1277

diff --git a/po/es.po b/po/es.po
@@ -5022,8 +5022,8 @@ msgstr "%s: la extensión Xv  no está presente.\n"
 #: src/video_out/video_out_xcbxv.c:1221 src/video_out/video_out_xv.c:1265
 #: src/video_out/video_out_xxmc.c:2497
 #, c-format
-msgid "%s: could not open Xv port %d - autodetecting\n"
+msgid "%s: could not open Xv port %lu - autodetecting\n"
-msgstr "%s: no se pudo abrir el puerto Xv %d - autodetectando\n"
+msgstr "%s: no se pudo abrir el puerto Xv %lu - autodetectando\n"
 
 #: src/video_out/video_out_xcbxv.c:1237 src/video_out/video_out_xv.c:1277
 #: src/video_out/video_out_xxmc.c:2509

diff --git a/po/eu.po b/po/eu.po
@@ -4470,7 +4470,7 @@ msgstr "video_out_xv: Xv luzapena ez dago.\n"
 #: src/video_out/video_out_xcbxv.c:1221 src/video_out/video_out_xv.c:1265
 #: src/video_out/video_out_xxmc.c:2497
 #, c-format
-msgid "%s: could not open Xv port %d - autodetecting\n"
+msgid "%s: could not open Xv port %lu - autodetecting\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbxv.c:1237 src/video_out/video_out_xv.c:1277

diff --git a/po/fr.po b/po/fr.po
@@ -4189,7 +4189,7 @@ msgstr ""
 #: src/video_out/video_out_xcbxv.c:1221 src/video_out/video_out_xv.c:1265
 #: src/video_out/video_out_xxmc.c:2497
 #, c-format
-msgid "%s: could not open Xv port %d - autodetecting\n"
+msgid "%s: could not open Xv port %lu - autodetecting\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbxv.c:1237 src/video_out/video_out_xv.c:1277

diff --git a/po/it.po b/po/it.po
@@ -4868,7 +4868,7 @@ msgstr "video_out_xv: estensione Xv non presente.\n"
 #: src/video_out/video_out_xcbxv.c:1221 src/video_out/video_out_xv.c:1265
 #: src/video_out/video_out_xxmc.c:2497
 #, c-format
-msgid "%s: could not open Xv port %d - autodetecting\n"
+msgid "%s: could not open Xv port %lu - autodetecting\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbxv.c:1237 src/video_out/video_out_xv.c:1277

diff --git a/po/ja.po b/po/ja.po
@@ -4180,7 +4180,7 @@ msgstr ""
 #: src/video_out/video_out_xcbxv.c:1221 src/video_out/video_out_xv.c:1265
 #: src/video_out/video_out_xxmc.c:2497
 #, fuzzy, c-format
-msgid "%s: could not open Xv port %d - autodetecting\n"
+msgid "%s: could not open Xv port %lu - autodetecting\n"
 msgstr "Gaim は監視するポートを開けませんでした。"
 
 #: src/video_out/video_out_xcbxv.c:1237 src/video_out/video_out_xv.c:1277

diff --git a/po/pl.po b/po/pl.po
@@ -4350,7 +4350,7 @@ msgstr ""
 #: src/video_out/video_out_xcbxv.c:1221 src/video_out/video_out_xv.c:1265
 #: src/video_out/video_out_xxmc.c:2497
 #, c-format
-msgid "%s: could not open Xv port %d - autodetecting\n"
+msgid "%s: could not open Xv port %lu - autodetecting\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbxv.c:1237 src/video_out/video_out_xv.c:1277

diff --git a/po/pt_BR.po b/po/pt_BR.po
@@ -4081,7 +4081,7 @@ msgstr ""
 #: src/video_out/video_out_xcbxv.c:1221 src/video_out/video_out_xv.c:1265
 #: src/video_out/video_out_xxmc.c:2497
 #, c-format
-msgid "%s: could not open Xv port %d - autodetecting\n"
+msgid "%s: could not open Xv port %lu - autodetecting\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbxv.c:1237 src/video_out/video_out_xv.c:1277

diff --git a/po/sk.po b/po/sk.po
@@ -4431,7 +4431,7 @@ msgstr "video_out_xv: Xv rozšírenie neprítomné.\n"
 #: src/video_out/video_out_xcbxv.c:1221 src/video_out/video_out_xv.c:1265
 #: src/video_out/video_out_xxmc.c:2497
 #, c-format
-msgid "%s: could not open Xv port %d - autodetecting\n"
+msgid "%s: could not open Xv port %lu - autodetecting\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbxv.c:1237 src/video_out/video_out_xv.c:1277

diff --git a/po/tr.po b/po/tr.po
@@ -4844,7 +4844,7 @@ msgstr "video_out_xv: Xv uzantısı hazır değil.\n"
 #: src/video_out/video_out_xcbxv.c:1221 src/video_out/video_out_xv.c:1265
 #: src/video_out/video_out_xxmc.c:2497
 #, c-format
-msgid "%s: could not open Xv port %d - autodetecting\n"
+msgid "%s: could not open Xv port %lu - autodetecting\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbxv.c:1237 src/video_out/video_out_xv.c:1277

diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c
@@ -90,7 +90,7 @@ static int open_mpc_file(demux_mpc_t *this) {
   /* TODO: non-seeking version */
   if (INPUT_IS_SEEKABLE(this->input)) {
     /* Check for id3v2 tag */
-    if (id3v2_istag(this->header)) {
+    if (id3v2_istag(_X_BE_32(this->header))) {
 
       lprintf("found id3v2 header\n");
 

diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
@@ -540,7 +540,7 @@ static void real_parse_headers (demux_real_t *this) {
 
 	    lprintf("audio version %d detected\n", version);
 
-	    char *fourcc_ptr = "\0\0\0";
+	    const char *fourcc_ptr = "\0\0\0";
 	    switch(version) {
             case 3:
               /* Version 3 header stores fourcc after meta info - cheat by reading backwards from the

diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c
@@ -643,7 +643,7 @@ static post_plugin_t *stretch_open_plugin(post_class_t *class_gen, int inputs,
 
   pthread_mutex_init (&this->lock, NULL);
 
-  set_parameters ((xine_post_t *)&this->post, &init_params);
+  set_parameters (&this->post.xine_post, &init_params);
 
   port = _x_post_intercept_audio_port(&this->post, audio_target[0], &input, &output);
   port->new_port.open       = stretch_port_open;

diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c
@@ -315,7 +315,7 @@ static post_plugin_t *upmix_mono_open_plugin(post_class_t *class_gen, int inputs
 
   pthread_mutex_init (&this->lock, NULL);
 
-  set_parameters ((xine_post_t *)&this->post, &init_params);
+  set_parameters (&this->post.xine_post, &init_params);
 
   port = _x_post_intercept_audio_port(&this->post, audio_target[0], &input, &output);
   port->new_port.open       = upmix_mono_port_open;

diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c
@@ -395,7 +395,7 @@ static post_plugin_t *deinterlace_open_plugin(post_class_t *class_gen, int input
 
   pthread_mutex_init (&this->lock, NULL);
 
-  set_parameters ((xine_post_t *)&this->post, &class->init_param);
+  set_parameters (&this->post.xine_post, &class->init_param);
 
   port = _x_post_intercept_video_port(&this->post, video_target[0], &input, &output);
   /* replace with our own get_frame function */
@@ -437,6 +437,7 @@ static void deinterlace_dispose(post_plugin_t *this_gen)
   if (_x_post_dispose(this_gen)) {
     _flush_frames(this);
     pthread_mutex_destroy(&this->lock);
+    free(this->tvtime);
     free(this);
   }
 }

diff --git a/src/spu_dec/spudvb_decoder.c b/src/spu_dec/spudvb_decoder.c
@@ -34,6 +34,7 @@
 #include <xine/xine_internal.h>
 #include <xine/spu.h>
 #include <xine/osd.h>
+
 #define MAX_REGIONS 7
 
 #define SPU_MAX_WIDTH 1920

diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
@@ -229,7 +229,7 @@ typedef void *(*thread_run_t)(void *);
 
 typedef struct {
     /* Name of render backend */
-    char *name;
+    const char * const name;
     /* Finally display current image (needed for Redraw) */
     void (*display)(opengl_driver_t *, opengl_frame_t *);
     /* Upload new image; Returns 0 if failed */
@@ -678,7 +678,7 @@ static int render_image_envtex (opengl_driver_t *this, opengl_frame_t *frame) {
 /*
  * Render setup functions
  */
-static int render_help_verify_ext (opengl_driver_t *this, char *ext) {
+static int render_help_verify_ext (opengl_driver_t *this, const char *ext) {
   int ret = 0;
   const size_t l = strlen (ext);
   const char *e;
@@ -929,7 +929,7 @@ static int render_setup_torus (opengl_driver_t *this) {
 static int render_setup_fp_yuv (opengl_driver_t *this) {
   GLint errorpos;
   int ret;
-  static char *fragprog_yuv =
+  static const char *fragprog_yuv =
     "!!ARBfp1.0\n"
     "ATTRIB tex = fragment.texcoord[0];"
     "PARAM  off = program.env[0];"
@@ -1823,7 +1823,7 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v
   config_values_t      *config  = class->xine->config;
   x11_visual_t         *visual  = (x11_visual_t *) visual_gen;
   opengl_driver_t      *this;
-  char                **render_fun_names;
+  const char          **render_fun_names;
   int                   i;
 
   this = (opengl_driver_t *) calloc(1, sizeof(opengl_driver_t));

diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c
@@ -864,7 +864,7 @@ static int xshm_gui_data_exchange (vo_driver_t *this_gen,
   break;
 
   case XINE_GUI_SEND_DRAWABLE_CHANGED:
-    this->window = (xcb_window_t) data;
+    this->window = (xcb_window_t) (long) data;
 
     pthread_mutex_lock(&this->main_mutex);
     xcb_free_gc(this->connection, this->gc);

diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
@@ -826,7 +826,7 @@ static int xv_gui_data_exchange (vo_driver_t *this_gen,
 
   case XINE_GUI_SEND_DRAWABLE_CHANGED:
     pthread_mutex_lock(&this->main_mutex);
-    this->window = (xcb_window_t) data;
+    this->window = (xcb_window_t) (long) data;
     xcb_free_gc(this->connection, this->gc);
     this->gc = xcb_generate_id(this->connection);
     xcb_create_gc(this->connection, this->gc, this->window, 0, NULL);
@@ -973,9 +973,9 @@ static int xv_check_yv12(xcb_connection_t *connection, xcb_xv_port_t port) {
 static void xv_check_capability (xv_driver_t *this,
 				 int property, xcb_xv_attribute_info_t *attr,
 				 int base_id,
-				 char *config_name,
+				 const char *config_name,
-				 char *config_desc,
+				 const char *config_desc,
-				 char *config_help) {
+				 const char *config_help) {
   int          int_default;
   cfg_entry_t *entry;
   const char  *str_prop = xcb_xv_attribute_info_name(attr);
@@ -1218,8 +1218,8 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
   if (xv_port != 0) {
     if (! xv_open_port(this, xv_port)) {
       xprintf(class->xine, XINE_VERBOSITY_NONE,
-	      _("%s: could not open Xv port %d - autodetecting\n"),
+	      _("%s: could not open Xv port %lu - autodetecting\n"),
-	      LOG_MODULE, xv_port);
+	      LOG_MODULE, (unsigned long)xv_port);
       adaptor_it = adaptor_first;
       xv_port = xv_autodetect_port (this, &adaptor_it, xv_port, prefer_type);
     } else

diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
@@ -783,7 +783,7 @@ static void xvmc_update_frame_format (vo_driver_t *this_gen,
     frame->ratio               = ratio;
   }
 
-  xvmc->macroblocks = (xine_macroblocks_t *)&this->macroblocks;
+  xvmc->macroblocks = &this->macroblocks.xine_mc;
   this->macroblocks.num_blocks = 0;
   this->macroblocks.macroblockptr = this->macroblocks.macroblockbaseptr;
   this->macroblocks.xine_mc.blockptr =

diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c
@@ -2494,8 +2494,8 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   if (xv_port != 0) {
     if (! xxmc_open_port(this, xv_port)) {
       xprintf(class->xine, XINE_VERBOSITY_NONE,
-	      _("%s: could not open Xv port %d - autodetecting\n"),
+	      _("%s: could not open Xv port %lu - autodetecting\n"),
-	      LOG_MODULE, xv_port);
+	      LOG_MODULE, (unsigned long)xv_port);
       xv_port = xxmc_autodetect_port(this, adaptors, adaptor_info, &adaptor_num, xv_port, prefer_type);
     } else
       adaptor_num = xxmc_find_adaptor_by_port (xv_port, adaptors, adaptor_info);

diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
@@ -2026,7 +2026,7 @@ static int _x_get_current_frame_data (xine_stream_t *stream,
 				      int flags, int img_size_unknown) {
 
   vo_frame_t *frame;
-  size_t required_size;
+  size_t required_size = 0;
 
   stream->xine->port_ticket->acquire(stream->xine->port_ticket, 0);
   frame = stream->video_out->get_last_frame (stream->video_out);