]> git.sesse.net Git - ffmpeg/commitdiff
lavd/sdl2: add sdl alias
authorJosh de Kock <josh@itanimul.li>
Sun, 25 Sep 2016 11:55:16 +0000 (12:55 +0100)
committerJosh de Kock <josh@itanimul.li>
Sun, 25 Sep 2016 17:08:06 +0000 (18:08 +0100)
This commit also adds an sdl alias for the configure script.

configure
libavdevice/sdl2.c

index f593191034065caf8f818524d585a5a36e81bb10..899057db863471c64afa5423ad77ce0cb86be162 100755 (executable)
--- a/configure
+++ b/configure
@@ -1547,6 +1547,7 @@ EXTERNAL_LIBRARY_LIST="
     opengl
     openssl
     schannel
+    sdl
     sdl2
     securetransport
     videotoolbox
@@ -5846,6 +5847,7 @@ if enabled gcrypt; then
     fi
 fi
 
+disabled sdl && disable sdl2
 if ! disabled sdl2; then
     SDL2_CONFIG="${cross_prefix}sdl2-config"
     if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then
index 217ccc039e829f0d5f63f9104b7c192250ad3713..5d9e91ec2139af7a905570d376a421b8f51249d8 100644 (file)
@@ -352,7 +352,7 @@ static const AVClass sdl2_class = {
 };
 
 AVOutputFormat ff_sdl2_muxer = {
-    .name           = "sdl2",
+    .name           = "sdl,sdl2",
     .long_name      = NULL_IF_CONFIG_SMALL("SDL2 output device"),
     .priv_data_size = sizeof(SDLContext),
     .audio_codec    = AV_CODEC_ID_NONE,