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

avplay: enable only when SDL 1.2 is found 

SDL 2 is API incompatible.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Vittorio Giovara 2013-03-06 17:15:50 +01:00 committed by Luca Barbato
parent adfa53d67c
commit 2eaa3663fd
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
avplay.c
View File

@ -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);

5
configure vendored
View File

@ -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