Skip to content

V
vlc-2-2
Commit e8c090dc authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

x264: set requirement to >= 0.76 for libx264 

Change to handle changed x264_encoder_headers and nal-stuff
parent 2186305a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 300 deletions
configure.ac
View file @ e8c090dc
...@@ -3354,7 +3354,7 @@ if test "${enable_x264}" != "no"; then ...@@ -3354,7 +3354,7 @@ if test "${enable_x264}" != "no"; then
AC_MSG_ERROR([the specified tree doesn't have x264.h]) AC_MSG_ERROR([the specified tree doesn't have x264.h])
fi fi
else else
PKG_CHECK_MODULES(X264,x264, [ PKG_CHECK_MODULES(X264,x264 >= 0.76, [
VLC_ADD_PLUGIN([x264]) VLC_ADD_PLUGIN([x264])
VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
......
modules/codec/x264.c
View file @ e8c090dc
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