Module: libav Branch: master Commit: 2eaa3663fda750dac66d41fe8541a8744d5563a4
Author: Vittorio Giovara <[email protected]> Committer: Luca Barbato <[email protected]> Date: Wed Mar 6 17:15:50 2013 +0100 avplay: enable only when SDL 1.2 is found SDL 2 is API incompatible. Signed-off-by: Luca Barbato <[email protected]> --- avplay.c | 2 -- configure | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/avplay.c b/avplay.c index b87e270..754a69f 100644 --- a/avplay.c +++ b/avplay.c @@ -2967,11 +2967,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); diff --git a/configure b/configure index 01bfbb1..f690db1 100755 --- a/configure +++ b/configure @@ -1301,7 +1301,6 @@ HAVE_LIST=" rdtsc sched_getaffinity sdl - sdl_video_size SetConsoleTextAttribute setmode setrlimit @@ -3596,8 +3595,8 @@ fi if check_pkg_config sdl SDL_events.h SDL_PollEvent; then check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags && - enable sdl && - check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size + check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags && + enable sdl fi texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
