[FFmpeg-devel] [PATCH] configure: add pkg-config support for libx264

2014-10-17 Thread Benoit Fouet 
---
 configure | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 3e7143c..5b16af9 100755
--- a/configure
+++ b/configure
@@ -4880,7 +4880,10 @@ enabled libvpx {
 enabled libvpx_vp9_encoder  { check_lib2 vpx/vpx_encoder.h vpx/vp8cx.h 
vpx_codec_vp9_cx VP9E_SET_AQ_MODE -lvpx || disable libvpx_vp9_encoder; } }
 enabled libwavpack require libwavpack wavpack/wavpack.h 
WavpackOpenFileOutput  -lwavpack
 enabled libwebprequire_pkg_config libwebp = 0.2.0 
webp/encode.h WebPGetEncoderVersion
-enabled libx264require libx264 x264.h x264_encoder_encode -lx264 

+enabled libx264{ { check_pkg_config x264 stdint.h x264.h 
x264_encoder_encode 
+ require_pkg_config x264 stdint.h x264.h 
x264_encoder_encode; } ||
+   { require libx264 x264.h x264_encoder_encode 
-lx264 
+ warn using libx264 without pkg-config; } } 

  { check_cpp_condition x264.h X264_BUILD = 118 
||
die ERROR: libx264 must be installed and 
version must be = 0.118.; }
 enabled libx265require_pkg_config x265 x265.h 
x265_encoder_encode 
-- 
2.1.2.443.g670a3c1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] configure: add pkg-config support for libx264

2014-10-17 Thread Carl Eugen Hoyos 
Benoit Fouet benoit.fouet at free.fr writes:

 +enabled libx264{ { check_pkg_config x264 stdint.h x264.h 
 x264_encoder_encode 
 + require_pkg_config x264 stdint.h 
 x264.h x264_encoder_encode; } ||
 +   { require libx264 x264.h 
 x264_encoder_encode -lx264

No objections from me.
(Works fine here.)

Carl Eugen

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] configure: add pkg-config support for libx264

2014-10-17 Thread Carl Eugen Hoyos 
Benoit Fouet benoit.fouet at free.fr writes:

 +enabled libx264{ { check_pkg_config x264

I forgot:
You could add a line to the Changelog pkg-config is now 
preferred over --extra-*flags for x264 detection.

Carl Eugen

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] configure: add pkg-config support for libx264

2014-10-17 Thread James Almer 
On 17/10/14 8:49 PM, Carl Eugen Hoyos wrote:
 Benoit Fouet benoit.fouet at free.fr writes:
 
 +enabled libx264{ { check_pkg_config x264
 
 I forgot:
 You could add a line to the Changelog pkg-config is now 
 preferred over --extra-*flags for x264 detection.

No need to mention it's preferred over anything (especially when --extra-cflags 
wasn't even necessary in 99% of cases and only a small portion of users ever 
needed to use that).
A line saying something like x264 may now also be detected with pkg-config is 
enough.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] configure: add pkg-config support for libx264

2014-10-17 Thread Carl Eugen Hoyos 
James Almer jamrial at gmail.com writes:

  You could add a line to the Changelog pkg-config is now 
  preferred over --extra-*flags for x264 detection.

 A line saying something like x264 may now also 
 be detected with pkg-config is enough.

I disagree (this would be the change that I 
originally suggested) but it is not that important.

Carl Eugen

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] configure: add pkg-config support for libx264

2014-10-17 Thread Michael Niedermayer 
On Fri, Oct 17, 2014 at 11:48:12PM +, Carl Eugen Hoyos wrote:
 Benoit Fouet benoit.fouet at free.fr writes:
 
  +enabled libx264{ { check_pkg_config x264 stdint.h x264.h 
  x264_encoder_encode 
  + require_pkg_config x264 stdint.h 
  x264.h x264_encoder_encode; } ||
  +   { require libx264 x264.h 
  x264_encoder_encode -lx264
 
 No objections from me.
 (Works fine here.)

applied

thanks

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Rewriting code that is poorly written but fully understood is good.
Rewriting code that one doesnt understand is a sign that one is less smart
then the original author, trying to rewrite it will not make it better.


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel