Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4'

* commit '2eaa3663fda750dac66d41fe8541a8744d5563a4':
  avplay: enable only when SDL 1.2 is found

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 0 insertions, 2 deletions

diff --git a/ffplay.c b/ffplay.c
index 8e7d207291..279e246ba9 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -3351,11 +3351,9 @@ int main(int argc, char **argv)
     }
 
     if (!display_disable) {
-#if HAVE_SDL_VIDEO_SIZE
         const SDL_VideoInfo *vi = SDL_GetVideoInfo();
         fs_screen_width = vi->current_w;
         fs_screen_height = vi->current_h;
-#endif
     }
 
     SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);