[MPlayer-cvslog] r23107 - in trunk/libmpdemux: asfheader.c demux_mov.c demux_real.c

[diego]

Author: diego
Date: Wed Apr 25 02:03:27 2007
New Revision: 23107

Log:
Declarations and code should not be mixed.


Modified:
   trunk/libmpdemux/asfheader.c
   trunk/libmpdemux/demux_mov.c
   trunk/libmpdemux/demux_real.c

Modified: trunk/libmpdemux/asfheader.c
==============================================================================
--- trunk/libmpdemux/asfheader.c	(original)
+++ trunk/libmpdemux/asfheader.c	Wed Apr 25 02:03:27 2007
@@ -460,10 +460,11 @@ int read_asf_header(demuxer_t *demuxer,s
         break;
         }
       case ASF_GUID_PREFIX_video_stream: {
+        unsigned int len;
+        float asp_ratio;
         sh_video_t* sh_video=new_sh_video(demuxer,streamh->stream_no & 0x7F);
         mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "asfheader", streamh->stream_no & 0x7F);
-        unsigned int len=streamh->type_size-(4+4+1+2);
-        float asp_ratio;
+        len=streamh->type_size-(4+4+1+2);
 	++video_streams;
 //        sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize);
         sh_video->bih=calloc((len<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):len,1);

Modified: trunk/libmpdemux/demux_mov.c
==============================================================================
--- trunk/libmpdemux/demux_mov.c	(original)
+++ trunk/libmpdemux/demux_mov.c	Wed Apr 25 02:03:27 2007
@@ -978,13 +978,12 @@ quit_vorbis_block:
 		break;
 	    }
 	    case MOV_TRAK_VIDEO: {
-		int i, entry;
+		int depth, i, entry;
 		int flag, start, count_flag, end, palette_count, gray;
 		int hdr_ptr = 76;  // the byte just after depth
 		unsigned char *palette_map;
 		sh_video_t* sh=new_sh_video(demuxer,priv->track_db);
 		mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "mov", priv->track_db);
-		int depth;
 		sh->format=trak->fourcc;
 
 		// crude video delay from editlist0 hack ::atm

Modified: trunk/libmpdemux/demux_real.c
==============================================================================
--- trunk/libmpdemux/demux_real.c	(original)
+++ trunk/libmpdemux/demux_real.c	Wed Apr 25 02:03:27 2007
@@ -1271,7 +1271,6 @@ static demuxer_t* demux_open_real(demuxe
 		} else {
 		    /* audio header */
 		    sh_audio_t *sh = new_sh_audio(demuxer, stream_id);
-		    mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "real", stream_id);
 		    char buf[128]; /* for codec name */
 		    int frame_size;
 		    int sub_packet_size;
@@ -1283,7 +1282,7 @@ static demuxer_t* demux_open_real(demuxe
 		    int i;
 		    char *buft;
 		    int hdr_size;
-		    
+		    mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "real", stream_id);
 		    mp_msg(MSGT_DEMUX,MSGL_V,"Found audio stream!\n");
 		    version = stream_read_word(demuxer->stream);
 		    mp_msg(MSGT_DEMUX,MSGL_V,"version: %d\n", version);