RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-01 12:42:04 +00:00
Code Issues Releases Wiki Activity

Fix statement-before-declaration warnings.

Browse Source 
Having a look at the gcc output before committing is a good idea btw.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20920 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-11-14 13:41:24 +00:00
parent 31482783c5
commit de555bc284
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mplayer.c
View File

@ -2760,6 +2760,7 @@ static int generate_video_frame(sh_video_t *sh_video, demux_stream_t *d_video)
double pts; double pts;
while (1) { while (1) {
void *decoded_frame;
current_module = "decode video"; current_module = "decode video";
// XXX Time used in this call is not counted in any performance // XXX Time used in this call is not counted in any performance
// timer now, OSD is not updated correctly for filter-added frames // timer now, OSD is not updated correctly for filter-added frames
@ -2778,7 +2779,7 @@ static int generate_video_frame(sh_video_t *sh_video, demux_stream_t *d_video)
if (pts == MP_NOPTS_VALUE) if (pts == MP_NOPTS_VALUE)
mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts value from demuxer MISSING\n"); mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts value from demuxer MISSING\n");
current_module = "decode video"; current_module = "decode video";
void *decoded_frame = decode_video(sh_video, start, in_size, 0, pts); decoded_frame = decode_video(sh_video, start, in_size, 0, pts);
if (decoded_frame) { if (decoded_frame) {
update_osd_msg(); update_osd_msg();
if (filter_video(sh_video, decoded_frame, sh_video->pts)) if (filter_video(sh_video, decoded_frame, sh_video->pts))
@ -3009,9 +3010,9 @@ int fill_audio_out_buffers(void)
int sleep_until_update(float *time_frame, float *aq_sleep_time) int sleep_until_update(float *time_frame, float *aq_sleep_time)
{ {
int frame_time_remaining = 0;
current_module="calc_sleep_time"; current_module="calc_sleep_time";
int frame_time_remaining = 0;
*time_frame -= GetRelativeTime(); // reset timer *time_frame -= GetRelativeTime(); // reset timer
if (sh_audio && !d_audio->eof) { if (sh_audio && !d_audio->eof) {
@ -4342,6 +4343,7 @@ if(!sh_video) {
blit_frame = 0; // Don't blit if we hit EOF blit_frame = 0; // Don't blit if we hit EOF
if (!correct_pts) while(1) if (!correct_pts) while(1)
{ unsigned char* start=NULL; { unsigned char* start=NULL;
void *decoded_frame;
int in_size; int in_size;
// get it! // get it!
current_module="video_read_frame"; current_module="video_read_frame";
@ -4373,7 +4375,7 @@ if(!sh_video) {
current_module="decode_video"; current_module="decode_video";
// printf("Decode! %p %d \n",start,in_size); // printf("Decode! %p %d \n",start,in_size);
update_osd_msg(); update_osd_msg();
void *decoded_frame = decode_video(sh_video,start,in_size,drop_frame, sh_video->pts); decoded_frame = decode_video(sh_video,start,in_size,drop_frame, sh_video->pts);
blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame, blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame,
sh_video->pts)); sh_video->pts));
break; break;