[FFmpeg-cvslog] lavd/sdl2: add sdl alias

Josh de Kock git at videolan.org
Sun Sep 25 20:09:41 EEST 2016


ffmpeg | branch: master | Josh de Kock <josh at itanimul.li> | Sun Sep 25 12:55:16 2016 +0100| [21344991c0d2a651d221dbdbb416031462a70d2c] | committer: Josh de Kock

lavd/sdl2: add sdl alias

This commit also adds an sdl alias for the configure script.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21344991c0d2a651d221dbdbb416031462a70d2c
---

 configure          | 2 ++
 libavdevice/sdl2.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index f593191..899057d 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 217ccc0..5d9e91e 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,



More information about the ffmpeg-cvslog mailing list