[FFmpeg-cvslog] avdevice/sdl2output : fix setting window_size

Martin Vignali git at videolan.org
Sat May 19 15:56:09 EEST 2018


ffmpeg | branch: master | Martin Vignali <martin.vignali at gmail.com> | Tue May  8 11:47:13 2018 +0200| [644130bcaa22ed42718e1e0aabcb0e398b8414ff] | committer: Martin Vignali

avdevice/sdl2output : fix setting window_size

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=644130bcaa22ed42718e1e0aabcb0e398b8414ff
---

 libavdevice/sdl2.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c
index 48ed977beb..e363df398d 100644
--- a/libavdevice/sdl2.c
+++ b/libavdevice/sdl2.c
@@ -206,9 +206,7 @@ static int sdl2_write_header(AVFormatContext *s)
         }
     }
 
-    sdl->window_width = sdl->texture_rect.w = codecpar->width;
-    sdl->window_height = sdl->texture_rect.h = codecpar->height;
-    sdl->texture_rect.x = sdl->texture_rect.y = 0;
+    compute_texture_rect(s);
 
     if (SDL_CreateWindowAndRenderer(sdl->window_width, sdl->window_height,
                                     flags, &sdl->window, &sdl->renderer) != 0){
@@ -219,7 +217,7 @@ static int sdl2_write_header(AVFormatContext *s)
     SDL_SetWindowTitle(sdl->window, sdl->window_title);
 
     sdl->texture = SDL_CreateTexture(sdl->renderer, sdl->texture_fmt, SDL_TEXTUREACCESS_STREAMING,
-                                     sdl->window_width, sdl->window_height);
+                                     codecpar->width, codecpar->height);
 
     if (!sdl->texture) {
         av_log(sdl, AV_LOG_ERROR, "Unable to set create mode: %s\n", SDL_GetError());



More information about the ffmpeg-cvslog mailing list