From 552206882168b6ef4bacd1c3b198df21a0ce6ccf Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 14 Feb 2010 14:48:54 +0000
Subject: Simplify.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30580 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demux_avi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libmpdemux/demux_avi.c')

diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c
index 2024f8aa62..4dc4662c05 100644
--- a/libmpdemux/demux_avi.c
+++ b/libmpdemux/demux_avi.c
@@ -533,14 +533,15 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){
   // calculating audio/video bitrate:
   if(priv->idx_size>0){
     // we have index, let's count 'em!
+    AVIINDEXENTRY *idx = priv->idx;
     int64_t vsize=0;
     int64_t asize=0;
     size_t vsamples=0;
     size_t asamples=0;
     int i;
     for(i=0;i<priv->idx_size;i++){
-      int id=avi_stream_id(((AVIINDEXENTRY *)priv->idx)[i].ckid);
-      int len=((AVIINDEXENTRY *)priv->idx)[i].dwChunkLength;
+      int id=avi_stream_id(idx[i].ckid);
+      int len=idx[i].dwChunkLength;
       if(sh_video->ds->id == id) {
         vsize+=len;
         ++vsamples;
-- 
cgit v1.2.3


From c2c64b459fd7beba97569ab7849f90cbe8e5243e Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 14 Feb 2010 15:17:24 +0000
Subject: Make len unsigned. More correct anyway and avoids sign extension to
 64 bit for the 64+32 bit addition.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30584 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demux_avi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libmpdemux/demux_avi.c')

diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c
index 4dc4662c05..51a33ca6ae 100644
--- a/libmpdemux/demux_avi.c
+++ b/libmpdemux/demux_avi.c
@@ -541,7 +541,7 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){
     int i;
     for(i=0;i<priv->idx_size;i++){
       int id=avi_stream_id(idx[i].ckid);
-      int len=idx[i].dwChunkLength;
+      unsigned len=idx[i].dwChunkLength;
       if(sh_video->ds->id == id) {
         vsize+=len;
         ++vsamples;
-- 
cgit v1.2.3