summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh de Kock <josh@itanimul.li>2016-09-25 12:55:16 +0100
committerJosh de Kock <josh@itanimul.li>2016-09-25 18:08:06 +0100
commit21344991c0d2a651d221dbdbb416031462a70d2c (patch)
tree188f2374616a4b2d32e0d2f89f6361816c99bc7e
parentfbb1fcd4d0b4613b500d01549f8ecd792f895002 (diff)
lavd/sdl2: add sdl alias
This commit also adds an sdl alias for the configure script.
-rwxr-xr-xconfigure2
-rw-r--r--libavdevice/sdl2.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index f593191034..899057db86 100755
--- 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
diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c
index 217ccc039e..5d9e91ec21 100644
--- a/libavdevice/sdl2.c
+++ b/libavdevice/sdl2.c
@@ -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,