RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-18 21:27:00 +00:00
Code Issues Releases Wiki Activity

Declarations and code should not be mixed.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23107 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-04-25 00:03:27 +00:00
parent 62cf4b0c60
commit 56c96cec50
3 changed files with 5 additions and 6 deletions

5
libmpdemux/asfheader.c
View File

@ -460,10 +460,11 @@ int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf){
break; break;
} }
case ASF_GUID_PREFIX_video_stream: { 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); 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); mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "asfheader", streamh->stream_no & 0x7F);
unsigned int len=streamh->type_size-(4+4+1+2); len=streamh->type_size-(4+4+1+2);
float asp_ratio;
++video_streams; ++video_streams;
// sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize); // sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize);
sh_video->bih=calloc((len<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):len,1); sh_video->bih=calloc((len<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):len,1);

3
libmpdemux/demux_mov.c
View File

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

3
libmpdemux/demux_real.c
View File

@ -1271,7 +1271,6 @@ static demuxer_t* demux_open_real(demuxer_t* demuxer)
} else { } else {
/* audio header */ /* audio header */
sh_audio_t *sh = new_sh_audio(demuxer, stream_id); 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 */ char buf[128]; /* for codec name */
int frame_size; int frame_size;
int sub_packet_size; int sub_packet_size;
@ -1283,7 +1282,7 @@ static demuxer_t* demux_open_real(demuxer_t* demuxer)
int i; int i;
char *buft; char *buft;
int hdr_size; int hdr_size;
mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "real", stream_id);
mp_msg(MSGT_DEMUX,MSGL_V,"Found audio stream!\n"); mp_msg(MSGT_DEMUX,MSGL_V,"Found audio stream!\n");
version = stream_read_word(demuxer->stream); version = stream_read_word(demuxer->stream);
mp_msg(MSGT_DEMUX,MSGL_V,"version: %d\n", version); mp_msg(MSGT_DEMUX,MSGL_V,"version: %d\n", version);