From b3b2a5f59b03edad08623b480d0c3d6707cc69e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Thu, 28 Feb 2019 17:26:37 +0100 Subject: [PATCH] avplay: update patch to accommodate SDL change Fixes #147. --- ports/libav.hash | 2 +- src/app/avplay/avplay.patch | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ports/libav.hash b/ports/libav.hash index 7f29ccf..a136913 100644 --- a/ports/libav.hash +++ b/ports/libav.hash @@ -1 +1 @@ -453c3394e14101acc88735246488d154380735ed +5441b0c6f799190b13b3ba1db6e60b5a2d13a6bb diff --git a/src/app/avplay/avplay.patch b/src/app/avplay/avplay.patch index ed85bbf..34c6b72 100644 --- a/src/app/avplay/avplay.patch +++ b/src/app/avplay/avplay.patch @@ -12,7 +12,7 @@ static int av_sync_type = AV_SYNC_AUDIO_MASTER; static int64_t start_time = AV_NOPTS_VALUE; static int64_t duration = AV_NOPTS_VALUE; -@@ -902,6 +902,16 @@ +@@ -902,6 +902,18 @@ && is->height== screen->h && screen->h == h) return 0; @@ -23,13 +23,15 @@ + return -1; + } + -+ w = modes[0]->w; -+ h = modes[0]->h; ++ if (modes != (SDL_Rect**)-1) { ++ w = modes[0]->w; ++ h = modes[0]->h; ++ } + #if defined(__APPLE__) && !SDL_VERSION_ATLEAST(1, 2, 14) /* setting bits_per_pixel = 0 or 32 causes blank video on OS X and older SDL */ screen = SDL_SetVideoMode(w, h, 24, flags); -@@ -962,7 +972,7 @@ +@@ -962,7 +974,7 @@ av_get_bytes_per_sample(is->sdl_sample_fmt); } if (bytes_per_sec)