[SCM] libav/experimental: remove code duplication
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:54:33 UTC 2013
The following commit has been merged in the experimental branch:
commit c03312ccac3c22a24886744ff1c81c4b1d4191f9
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Dec 30 11:32:10 2006 +0000
remove code duplication
Originally committed as revision 7386 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/ffplay.c b/ffplay.c
index 11ae3aa..e0b53bc 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2142,26 +2142,13 @@ static void stream_cycle_channel(VideoState *is, int codec_type)
static void toggle_full_screen(void)
{
- int w, h, flags;
is_full_screen = !is_full_screen;
if (!fs_screen_width) {
/* use default SDL method */
SDL_WM_ToggleFullScreen(screen);
} else {
/* use the recorded resolution */
- flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL;
- if (is_full_screen) {
- w = fs_screen_width;
- h = fs_screen_height;
- flags |= SDL_FULLSCREEN;
- } else {
- w = screen_width;
- h = screen_height;
- flags |= SDL_RESIZABLE;
- }
- screen = SDL_SetVideoMode(w, h, 0, flags);
- cur_stream->width = w;
- cur_stream->height = h;
+ video_open(cur_stream);
}
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list