Commit 9c5fab5e authored by Marton Balint's avatar Marton Balint Committed by Josh de Kock

ffplay: add SDL2 support

This commit also drops SDL1 support for ffplay.

Tested-by: James Almer <jamrial@gmail.com> (Windows, mingw-w64)
Signed-off-by: 's avatarJosh de Kock <josh@itanimul.li>
parent 64535382
...@@ -33,6 +33,7 @@ version <next>: ...@@ -33,6 +33,7 @@ version <next>:
- Meridian Lossless Packing (MLP) encoder - Meridian Lossless Packing (MLP) encoder
- Non-Local Means (nlmeans) denoising filter - Non-Local Means (nlmeans) denoising filter
- sdl2 output device - sdl2 output device
- sdl2 support for ffplay
version 3.1: version 3.1:
......
...@@ -3141,8 +3141,8 @@ ffmpeg_deps="avcodec avfilter avformat swresample" ...@@ -3141,8 +3141,8 @@ ffmpeg_deps="avcodec avfilter avformat swresample"
ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
null_filter null_filter
setpts_filter trim_filter" setpts_filter trim_filter"
ffplay_deps="avcodec avformat swscale swresample sdl" ffplay_deps="avcodec avformat swscale swresample sdl2"
ffplay_libs='$sdl_libs' ffplay_libs='$sdl2_libs'
ffplay_select="rdft crop_filter transpose_filter hflip_filter vflip_filter rotate_filter" ffplay_select="rdft crop_filter transpose_filter hflip_filter vflip_filter rotate_filter"
ffprobe_deps="avcodec avformat" ffprobe_deps="avcodec avformat"
ffserver_deps="avformat fork sarestart" ffserver_deps="avformat fork sarestart"
...@@ -6661,7 +6661,7 @@ HOSTLD_O=$HOSTLD_O ...@@ -6661,7 +6661,7 @@ HOSTLD_O=$HOSTLD_O
TARGET_EXEC=$target_exec $target_exec_args TARGET_EXEC=$target_exec $target_exec_args
TARGET_PATH=$target_path TARGET_PATH=$target_path
TARGET_SAMPLES=${target_samples:-\$(SAMPLES)} TARGET_SAMPLES=${target_samples:-\$(SAMPLES)}
CFLAGS-ffplay=$sdl_cflags CFLAGS-ffplay=${sdl2_cflags}
ZLIB=$($ldflags_filter -lz) ZLIB=$($ldflags_filter -lz)
LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
EXTRALIBS=$extralibs EXTRALIBS=$extralibs
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment