virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
50,430 Commits 37 Branches 400 Tags 463 MiB
ec203cd69b
Commit Graph

2773 Commits

Author SHA1 Message Date
Clément Bœsch
7b2d50f81e build: make iconv build configurable. 2013-02-28 01:23:24 +01:00
Clément Bœsch
2ecf564f94 build: fix iconv detection on some systems. 
This at least fix the build on CentOS.
 2013-02-27 21:00:38 +01:00
Michael Niedermayer
e907aa98cd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: icc: Drop nonsense adding of cpuflags to LDFLAGS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 13:13:10 +01:00
Michael Niedermayer
13fa074173 Merge commit 'e951b6d94c441d46b396ef12da1428297d77251d' 
* commit 'e951b6d94c441d46b396ef12da1428297d77251d':
  vorbisdec: cosmetics: rename variable avccontext to avctx
  configure: Identify icc compiler with a less ambiguous pattern

Conflicts:
	libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 12:39:26 +01:00
Michael Niedermayer
2b277f2992 Merge commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47' 
* commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47':
  configure: Separate "ln" command line arguments

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 12:32:17 +01:00
Diego Biurrun
3a02b6884c configure: icc: Drop nonsense adding of cpuflags to LDFLAGS 
This fixes many icc warnings when not setting the CPU type.
 2013-02-26 00:51:34 +01:00
Diego Biurrun
b2d688ea9f configure: Identify icc compiler with a less ambiguous pattern 2013-02-25 18:15:41 +01:00
Diego Biurrun
b58b00aeca configure: Separate "ln" command line arguments 
This is more compatible and not more complicated.
 2013-02-25 18:15:17 +01:00
Michael Niedermayer
036df234fb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: List external libs used using print_enabled()

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 18:02:37 +01:00
Michael Niedermayer
214cb30b72 Merge commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768' 
* commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768':
  configure: Move list of external libs to a separate variable

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 17:55:31 +01:00
Michael Niedermayer
5f8f9dc436 Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f' 
* commit '45235ac488363e3360bf2f2275102d1ec66eba0f':
  configure: Move x11grab option to a more suitable place in the help output
  lavr: allow setting internal_sample_fmt option by string
  lavr: Add "resample_cutoff" option as a duplicate of "cutoff"

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 17:45:06 +01:00
Michael Niedermayer
dbabea2f23 configure: hwaccel autodetection has been removed in 82ca17ac7a 
If you want it back (yeah i want it back too)
then you just need to volunteer to maintain the code in configure
thats related to hwaccel autodetection.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 16:40:46 +01:00
Diego Biurrun
fdd392ed27 configure: Simplify VDPAU header check 
Conflicts:

	configure
 2013-02-24 16:33:55 +01:00
Michael Niedermayer
8cf9253aef Merge commit '82ca17ac7a0a08784cb6808384ee237ac28e8334' 
* commit '82ca17ac7a0a08784cb6808384ee237ac28e8334':
  configure: Fix vaapi/vda/vdpau dependency declarations

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 16:18:21 +01:00
Michael Niedermayer
60cc4a32b5 Merge commit '215cdd35efd625ec28ef5846f1692b18f7c2c230' 
* commit '215cdd35efd625ec28ef5846f1692b18f7c2c230':
  configure: Refactor dxva2api.h dependency declarations

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 15:37:11 +01:00
Michael Niedermayer
845bf99312 Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74' 
* commit '4cc4b33f71d3982df404fceb4405d656c538bc74':
  build: Add proper infrastructure for adding and checking host CPPFLAGS

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 15:24:38 +01:00
Michael Niedermayer
56c245f921 Merge commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a' 
* commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a':
  configure: Simplify VDA header and extralibs check

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 14:58:06 +01:00
Michael Niedermayer
74c9245254 Merge commit '0a8da1a3e5f0b9329dfb89d17356ff5444c02351' 
* commit '0a8da1a3e5f0b9329dfb89d17356ff5444c02351':
  configure: Do not redundantly list enabled hwaccel libs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 14:50:19 +01:00
Michael Niedermayer
409890ca2f Merge commit '7432e872066d6960a9fbd31c51a94ebe6183389e' 
* commit '7432e872066d6960a9fbd31c51a94ebe6183389e':
  configure: Add print_3_columns helper function and use where appropriate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 14:37:54 +01:00
Mans Rullgard
04cccb5fc1 configure: List external libs used using print_enabled() 
This cuts some lines from the script as well as the output and
simplifies maintenance.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2013-02-24 00:19:36 +01:00
Mans Rullgard
3fc09b0081 configure: Move list of external libs to a separate variable 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2013-02-24 00:19:36 +01:00
Diego Biurrun
45235ac488 configure: Move x11grab option to a more suitable place in the help output 2013-02-24 00:19:36 +01:00
Diego Biurrun
82ca17ac7a configure: Fix vaapi/vda/vdpau dependency declarations 2013-02-23 21:08:40 +01:00
Diego Biurrun
215cdd35ef configure: Refactor dxva2api.h dependency declarations 2013-02-23 21:08:40 +01:00
Diego Biurrun
4cc4b33f71 build: Add proper infrastructure for adding and checking host CPPFLAGS 2013-02-23 20:23:45 +01:00
Diego Biurrun
9840130edf configure: Simplify VDA header and extralibs check 2013-02-23 20:13:48 +01:00
Diego Biurrun
2aac411fd4 configure: Simplify VDPAU header check 2013-02-23 20:13:48 +01:00
Mans Rullgard
0a8da1a3e5 configure: Do not redundantly list enabled hwaccel libs 
The enabled hwaccels are listed later anyway.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2013-02-23 20:13:47 +01:00
Diego Biurrun
7432e87206 configure: Add print_3_columns helper function and use where appropriate 2013-02-23 20:13:47 +01:00
James Almer
67b3fcf655 configure: Use libiconv on systems that lack built-in iconv 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 22:41:19 +01:00
Ronald S. Bultje
2b10d41464 h264: add videodsp dependency. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 02:12:26 +01:00
Paul B Mahol
76415a9420 configure: fix libavfilter pkgconfig description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-19 18:17:27 +00:00
Michael Niedermayer
82e82fa2e5 Merge commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b' 
* commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b':
  build: make audio_frame_queue a stand-alone component

Conflicts:
	configure
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 12:55:31 +01:00
Luca Barbato
aa11cb7931 build: make audio_frame_queue a stand-alone component 
Encoders requiring it have the dependency expressed in the
configure.
 2013-02-17 22:05:18 +01:00
Clément Bœsch
f796399344 lavc: support subtitles character encoding conversion. 2013-02-17 12:57:56 +01:00
Paul B Mahol
af882e1819 lavfi: port MP noise filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-16 11:42:41 +00:00
Michael Niedermayer
61fbb4cd57 Merge commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba' 
* commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba':
  avutil: Ensure that emms_c is always defined, even on non-x86
  configure: Move MinGW CPPFLAGS setting to libc section, where it belongs
  avutil: Move emms code to x86-specific header

Conflicts:
	configure
	libavutil/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-15 12:10:08 +01:00
Diego Biurrun
759a3a2177 configure: Move MinGW CPPFLAGS setting to libc section, where it belongs 2013-02-14 17:37:42 +01:00
Michael Niedermayer
08db519e12 Merge commit '56dea32f09e71460add14a1b6d0fbe6eb16f02a4' 
* commit '56dea32f09e71460add14a1b6d0fbe6eb16f02a4':
  doc: developer: Fix wording in "naming conventions" section
  openbsd: Add minor number to shared library install name

Conflicts:
	doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 13:41:24 +01:00
Michael Niedermayer
7491356111 Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b' 
* commit '304b806cb524fb040f8e09a241040f1af2cb820b':
  build: Make library minor version visible in the Makefile
  x86: mpeg4qpel: Make movsxifnidn do the right thing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 13:26:22 +01:00
Diego Biurrun
304b806cb5 build: Make library minor version visible in the Makefile 
This allows employing that number in library install commands.
 2013-02-11 20:17:15 +01:00
Diego Biurrun
69dca3a4f4 openbsd: Add minor number to shared library install name 
This is what the OpenBSD porter's manual describes as correct, cf.
http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs
 2013-02-11 20:17:15 +01:00
Michael Niedermayer
c4e394e460 Merge commit '79dad2a932534d1155079f937649e099f9e5cc27' 
* commit '79dad2a932534d1155079f937649e099f9e5cc27':
  dsputil: Separate h264chroma

Conflicts:
	libavcodec/dsputil_template.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/vc1dec.c
	libavcodec/vc1dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-07 13:09:35 +01:00
Michael Niedermayer
6c38884876 Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84' 
* commit '620289a20e022b9c16c10d546ef86cc0bb77cc84':
  sh4: Fix silly type vs. variable name search and replace typo
  configure: Group all hwaccels together in a separate variable
  Add av_cold attributes to arch-specific init functions

Conflicts:
	configure
	libavcodec/arm/mpegvideo_armv5te.c
	libavcodec/x86/mlpdsp.c
	libavcodec/x86/motion_est.c
	libavcodec/x86/mpegvideoenc.c
	libavcodec/x86/videodsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 13:27:24 +01:00
Diego Biurrun
79dad2a932 dsputil: Separate h264chroma 2013-02-06 11:30:53 +01:00
Diego Biurrun
70b348ec5b configure: Group all hwaccels together in a separate variable 2013-02-05 17:01:06 +01:00
James Almer
13eb9fcf56 build: Remove superfluous MAKE variable for the build suffix 
Use BUILDSUF instead.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-03 13:08:36 +01:00
Steven Boswell II
6289a8296a build-sys: Fix pkgconfig files when ffmpeg is built with --build-suffix 
Tested-on: Fedora Core 14, 16, and 17.
Tested-on: Ubuntu by commiter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-02 03:24:16 +01:00
Michael Niedermayer
dd87d4a318 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp
  configure: Add a comment indicating why uclibc is checked before glibc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-31 20:03:36 +01:00
Michael Niedermayer
01d012ba3d Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da' 
* commit '29f1fa74225e9fdbab6d590857edbecb51cf74da':
  configure: Move newlib libc check before mingw libc check
  avisynth: Change demuxer name to avoid conflicts with AVS

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-31 19:52:58 +01:00