diff options
author | Nicolas George <nicolas.george@normalesup.org> | 2012-06-09 14:28:44 +0400 |
---|---|---|
committer | Nicolas George <nicolas.george@normalesup.org> | 2012-06-10 11:42:31 +0400 |
commit | 3ff6b1a2b359d932fe865d20b706b8911aa93ea4 (patch) | |
tree | 650bc7255d6d7a9fcfda5f2dced8490616094082 /libavdevice/sdl.c | |
parent | 2f9907be3e0daf22177174de264fc04034c5b6bd (diff) |
sdl: fix overlay size.
The size passed to SDL_CreateYUVOverlay is the size
of the video in pixels, it must not take the aspect ratio
into account.
Diffstat (limited to 'libavdevice/sdl.c')
-rw-r--r-- | libavdevice/sdl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavdevice/sdl.c b/libavdevice/sdl.c index e4609a2837..c80d41c4e5 100644 --- a/libavdevice/sdl.c +++ b/libavdevice/sdl.c @@ -36,8 +36,8 @@ typedef struct { SDL_Overlay *overlay; char *window_title; char *icon_title; - int window_width, window_height; - int overlay_width, overlay_height; + int window_width, window_height; /**< size of the window */ + int overlay_width, overlay_height; /**< size of the video in the window */ int overlay_fmt; int sdl_was_already_inited; } SDLContext; @@ -144,12 +144,12 @@ static int sdl_write_header(AVFormatContext *s) goto fail; } - sdl->overlay = SDL_CreateYUVOverlay(sdl->overlay_width, sdl->overlay_height, + sdl->overlay = SDL_CreateYUVOverlay(encctx->width, encctx->height, sdl->overlay_fmt, sdl->surface); - if (!sdl->overlay || sdl->overlay->pitches[0] < sdl->overlay_width) { + if (!sdl->overlay || sdl->overlay->pitches[0] < encctx->width) { av_log(s, AV_LOG_ERROR, "SDL does not support an overlay with size of %dx%d pixels.\n", - sdl->overlay_width, sdl->overlay_height); + encctx->width, encctx->height); ret = AVERROR(EINVAL); goto fail; } |