diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2006-12-31 18:01:13 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2006-12-31 18:01:13 +0000 |
commit | 990c84384fe6de769300cb999f36525f9fccd1d9 (patch) | |
tree | 11d446d411e67fb22518a09889ff519bc95a63b1 /ffplay.c | |
parent | 8c982c5da7e567400baa7f9a34cca6e4c52fbe00 (diff) | |
download | ffmpeg-streaming-990c84384fe6de769300cb999f36525f9fccd1d9.zip ffmpeg-streaming-990c84384fe6de769300cb999f36525f9fccd1d9.tar.gz |
cosmetic (move video_open() up to avoid prototype)
Originally committed as revision 7388 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffplay.c')
-rw-r--r-- | ffplay.c | 78 |
1 files changed, 38 insertions, 40 deletions
@@ -829,7 +829,44 @@ static void video_audio_display(VideoState *s) 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 */ 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 */ static int stream_component_open(VideoState *is, int stream_index) { |