virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

cosmetic (move video_open() up to avoid prototype)

Browse Source 
Originally committed as revision 7388 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-12-31 18:01:13 +00:00
parent 8c982c5da7
commit 990c84384f
1 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
ffplay.c
View File

@ -829,7 +829,44 @@ static void video_audio_display(VideoState *s)
SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height); SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height);
} }
static int video_open(VideoState *is); static int video_open(VideoState *is){
int flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL;
int w,h;
if (is_full_screen && fs_screen_width) {
w = fs_screen_width;
h = fs_screen_height;
flags |= SDL_FULLSCREEN;
} else {
if(screen_width){
w = screen_width;
h = screen_height;
}else if (is->video_st && is->video_st->codec->width){
w = is->video_st->codec->width;
h = is->video_st->codec->height;
} else {
w = 640;
h = 480;
}
flags |= SDL_RESIZABLE;
}
#ifndef CONFIG_DARWIN
screen = SDL_SetVideoMode(w, h, 0, flags);
#else
/* setting bits_per_pixel = 0 or 32 causes blank video on OS X */
screen = SDL_SetVideoMode(w, h, 24, flags);
#endif
if (!screen) {
fprintf(stderr, "SDL: could not set video mode - exiting\n");
return -1;
}
SDL_WM_SetCaption("FFplay", "FFplay");
is->width = screen->w;
is->height = screen->h;
return 0;
}
/* display the current picture, if any */ /* display the current picture, if any */
static void video_display(VideoState *is) static void video_display(VideoState *is)
@ -1599,45 +1636,6 @@ void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
} }
} }
static int video_open(VideoState *is){
int flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL;
int w,h;
if (is_full_screen && fs_screen_width) {
w = fs_screen_width;
h = fs_screen_height;
flags |= SDL_FULLSCREEN;
} else {
if(screen_width){
w = screen_width;
h = screen_height;
}else if (is->video_st && is->video_st->codec->width){
w = is->video_st->codec->width;
h = is->video_st->codec->height;
} else {
w = 640;
h = 480;
}
flags |= SDL_RESIZABLE;
}
#ifndef CONFIG_DARWIN
screen = SDL_SetVideoMode(w, h, 0, flags);
#else
/* setting bits_per_pixel = 0 or 32 causes blank video on OS X */
screen = SDL_SetVideoMode(w, h, 24, flags);
#endif
if (!screen) {
fprintf(stderr, "SDL: could not set video mode - exiting\n");
return -1;
}
SDL_WM_SetCaption("FFplay", "FFplay");
is->width = screen->w;
is->height = screen->h;
return 0;
}
/* open a given stream. Return 0 if OK */ /* open a given stream. Return 0 if OK */
static int stream_component_open(VideoState *is, int stream_index) static int stream_component_open(VideoState *is, int stream_index)
{ {