Skip to content

V
vlc
Commit 64d3a241 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Revert "Contrib: block FFmpeg revision until dxva2 patch is updated for HEAD" 

This reverts commit 1e56f368.
parent 6adf794d
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
extras/contrib/src/Makefile
View file @ 64d3a241
...@@ -1024,7 +1024,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2 ...@@ -1024,7 +1024,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
ifdef SVN ifdef SVN
ffmpeg: ffmpeg:
$(SVN) co -r 20620 $(FFMPEG_SVN) ffmpeg $(SVN) co $(FFMPEG_SVN) ffmpeg
ifdef HAVE_ISA_THUMB ifdef HAVE_ISA_THUMB
patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
endif endif
......
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