RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Nicolas George 2012-06-09 12:28:44 +02:00
parent 2f9907be3e
commit 3ff6b1a2b3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavdevice/sdl.c
View File

@ -36,8 +36,8 @@ typedef struct {
SDL_Overlay *overlay; SDL_Overlay *overlay;
char *window_title; char *window_title;
char *icon_title; char *icon_title;
int window_width, window_height; int window_width, window_height; /**< size of the window */
int overlay_width, overlay_height; int overlay_width, overlay_height; /**< size of the video in the window */
int overlay_fmt; int overlay_fmt;
int sdl_was_already_inited; int sdl_was_already_inited;
} SDLContext; } SDLContext;
@ -144,12 +144,12 @@ static int sdl_write_header(AVFormatContext *s)
goto fail; 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); 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, av_log(s, AV_LOG_ERROR,
"SDL does not support an overlay with size of %dx%d pixels.\n", "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); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }