Misc warnings fixes.

CVS patchset: 8055
CVS date: 2006/06/18 20:29:03

3 files changed, 10 insertions, 9 deletions

diff --git a/src/libffmpeg/audio_decoder.c b/src/libffmpeg/audio_decoder.c
index 53e1415ee..a1a760100 100644
--- a/src/libffmpeg/audio_decoder.c
+++ b/src/libffmpeg/audio_decoder.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: audio_decoder.c,v 1.24 2006/04/21 23:22:04 dsalt Exp $
+ * $Id: audio_decoder.c,v 1.25 2006/06/18 20:29:04 dgp85 Exp $
  *
  * xine audio decoder plugin using ffmpeg
  *
@@ -134,7 +134,8 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
     this->size += buf->size;
     
     if (buf->decoder_flags & BUF_FLAG_FRAME_END) {
-      int i, codec_type;
+      size_t i;
+      unsigned int codec_type;
       xine_waveformatex *audio_header;
   
       codec_type = buf->type & 0xFFFF0000;
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c
index 656af6fd3..40d51ce6e 100644
--- a/src/libffmpeg/video_decoder.c
+++ b/src/libffmpeg/video_decoder.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: video_decoder.c,v 1.59 2005/11/04 22:37:14 tmattern Exp $
+ * $Id: video_decoder.c,v 1.60 2006/06/18 20:29:04 dgp85 Exp $
  *
  * xine video decoder plugin using ffmpeg
  *
@@ -274,8 +274,8 @@ static const ff_codec_t ff_video_lookup[] = {
   {BUF_VIDEO_MPEG,        CODEC_ID_MPEG1VIDEO, "MPEG 1/2 (ffmpeg)"} };
 
 
-static void init_video_codec (ff_video_decoder_t *this, int codec_type) {
-  int i;
+static void init_video_codec (ff_video_decoder_t *this, unsigned int codec_type) {
+  size_t i;
 
   /* find the decoder */
   this->codec = NULL;
@@ -858,8 +858,6 @@ static void ff_handle_header_buffer (ff_video_decoder_t *this, buf_element_t *bu
 }
 
 static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
-  int i;
-
   /* take care of all the various types of special buffers 
   * note that order is important here */
   lprintf("special buffer\n");
@@ -885,6 +883,7 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b
       buf->decoder_info[2]);
       
   } else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) {
+    unsigned int i;
 
     palette_entry_t *demuxer_palette;
     AVPaletteControl *decoder_palette;
@@ -903,6 +902,7 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b
     decoder_palette->palette_changed = 1;
 
   } else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) {
+    int i;
   
     lprintf("BUF_SPECIAL_RV_CHUNK_TABLE\n");
     this->context->slice_count = buf->decoder_info[2]+1;
diff --git a/src/libffmpeg/xine_encoder.c b/src/libffmpeg/xine_encoder.c
index f2442f00d..5f2efb692 100644
--- a/src/libffmpeg/xine_encoder.c
+++ b/src/libffmpeg/xine_encoder.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: xine_encoder.c,v 1.22 2006/04/05 22:12:19 valtri Exp $
+ * $Id: xine_encoder.c,v 1.23 2006/06/18 20:29:04 dgp85 Exp $
  */
  
 /* mpeg encoders for the dxr3 video out plugin. */
@@ -261,7 +261,7 @@ static int lavc_on_display_frame(dxr3_driver_t *drv, dxr3_frame_t *frame)
     }
   if (written != size)
       xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
-        "dxr3_mpeg_encoder: Could only write %d of %d mpeg bytes.\n", written, size);
+        "dxr3_mpeg_encoder: Could only write %zd of %d mpeg bytes.\n", written, size);
   return 1;
 }