[MPlayer-cvslog] r33221 - trunk/gui/util/bitmap.c

ib subversion at mplayerhq.hu
Tue Apr 5 14:50:56 CEST 2011


Author: ib
Date: Tue Apr  5 14:50:56 2011
New Revision: 33221

Log:
Make len match ftell() return value type.

Besides, cosmetic line changes.

Modified:
   trunk/gui/util/bitmap.c

Modified: trunk/gui/util/bitmap.c
==============================================================================
--- trunk/gui/util/bitmap.c	Tue Apr  5 12:44:38 2011	(r33220)
+++ trunk/gui/util/bitmap.c	Tue Apr  5 14:50:56 2011	(r33221)
@@ -32,9 +32,9 @@
 static int pngRead(unsigned char *fname, txSample *bf)
 {
     FILE *file;
-    int decode_ok;
+    long len;
     void *data;
-    int len;
+    int decode_ok;
     AVCodecContext *avctx;
     AVFrame *frame;
     AVPacket pkt;
@@ -71,6 +71,7 @@ static int pngRead(unsigned char *fname,
     // HACK: make PNGs decode normally instead of as CorePNG delta frames
     pkt.flags = AV_PKT_FLAG_KEY;
     avcodec_decode_video2(avctx, frame, &decode_ok, &pkt);
+
     memset(bf, 0, sizeof(*bf));
 
     switch (avctx->pix_fmt) {


More information about the MPlayer-cvslog mailing list