RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24862 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2007-10-27 12:33:56 +00:00
parent e88e5849d3
commit 8ff6e8a567
1 changed files with 73 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libmpdemux/video.c
View File

@ -97,12 +97,9 @@ switch(video_codec){
// display info:
// in case no strf chunk has been seen in avi, we have no bitmap header
if(!sh_video->bih) return 0;
sh_video->format=sh_video->bih->biCompression;
sh_video->disp_w=sh_video->bih->biWidth;
sh_video->disp_h=abs(sh_video->bih->biHeight);
}
break;
}
@ -365,7 +362,6 @@ mpeg_header_parser:
return 0;
}
if(mp_vc1_decode_sequence_header(&picture, &videobuffer[4], videobuf_len-4)) {
sh_video->bih = (BITMAPINFOHEADER *) calloc(1, sizeof(BITMAPINFOHEADER) + videobuf_len);
if(sh_video->bih == NULL) {
@ -490,7 +486,6 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_EnterTelecineMode);
telecine=1;
}
} else if(video_codec == VIDEO_MPEG4){
while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){
int i=sync_video_packet(d_video);
@ -500,7 +495,6 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
}
*start=videobuffer; in_size=videobuf_len;
videobuf_len=0;
} else if(video_codec == VIDEO_H264){
int in_picture = 0;
while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){
@ -542,7 +536,6 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
}
*start=videobuffer; in_size=videobuf_len;
videobuf_len=0;
} else if(video_codec == VIDEO_VC1) {
while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE) {
int i=sync_video_packet(d_video);
@ -632,9 +625,7 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
} else {
if(pts){
if(picture_coding_type<=2) sh_video->i_pts=pts;
else {
sh_video->pts=pts;
}
else sh_video->pts=pts;
}
}
} else
@ -642,6 +633,5 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
if(frame_time_ptr) *frame_time_ptr=frame_time;
return in_size;
}