Mercurial > mplayer.hg

changeset 33134:ffe524b8b8f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make len match ftell() return value type. Besides, cosmetic line changes.
author ib
date Tue, 05 Apr 2011 12:50:56 +0000
parents 41485430b18a
children 36fdc061b4a8
files gui/util/bitmap.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gui/util/bitmap.c	Tue Apr 05 10:44:38 2011 +0000
+++ b/gui/util/bitmap.c	Tue Apr 05 12:50:56 2011 +0000
@@ -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 @@
     // 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) {