summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libmpdemux/asfheader.c5
-rw-r--r--libmpdemux/demux_mov.c3
-rw-r--r--libmpdemux/demux_real.c3
3 files changed, 5 insertions, 6 deletions
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c
index 1ca0453920..78f8b39a08 100644
--- a/libmpdemux/asfheader.c
+++ b/libmpdemux/asfheader.c
@@ -460,10 +460,11 @@ int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf){
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);
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 641b163bf9..f342752597 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -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
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index 57356b77d0..501c27bfe1 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -1271,7 +1271,6 @@ static demuxer_t* demux_open_real(demuxer_t* demuxer)
} 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(demuxer_t* demuxer)
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);