Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Dec 20, 2014
  1. @michaelni

    Makefile: add dependencies which require ffversion.h

    michaelni authored
    Without this ffversion.h could sometimes be built too late
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Oct 22, 2014
  1. ffserver: move configuration code to separate file

    Lukasz Marek authored
    This commit doesn't change any existing logic.
    It moves ffserver configuration related code to separate file.
    It intends to make maintaining easier.
    
    Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Commits on Jul 22, 2014
  1. @michaelni

    Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'

    michaelni authored
    * commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d':
      configure: add support for neon intrinsics
    
    Conflicts:
    	configure
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @michaelni

    Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'

    michaelni authored
    * commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830':
      build: Support executable only ldflags
    
    Conflicts:
    	Makefile
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jul 21, 2014
  1. configure: add support for neon intrinsics

    Janne Grunau authored
  2. @lu-zero

    build: Support executable only ldflags

    lu-zero authored
    The options is useful to build position-independent executables on
    hardened systems (e.g. Android L and Gentoo Hardened).
Commits on Jun 18, 2014
  1. @elenril

    Remove avserver.

    elenril authored
    It has not been properly maintained for years and there is little hope
    of that changing in the future.
    It appears simpler to write a new replacement from scratch than
    unbreaking it.
Commits on May 15, 2014
  1. @michaelni

    Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'

    michaelni authored
    * commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f':
      build: add avresample after avcodec to FFLIBS
    
    Conflicts:
    	Makefile
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. build: add avresample after avcodec to FFLIBS

    Janne Grunau authored
    avcodec might depend on avresample and with --as-needed required symbols
    might be get removed if avresample is linked before avcodec.
    Fixes link failures of avprobe and avplay on aarch64 with
    --enable-neon-clobber-test.
Commits on May 12, 2014
  1. @michaelni

    Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'

    michaelni authored
    * commit '1839fafa951308237c4672ffd9a94f927b26eac7':
      avconv: Support VDA hwaccel
    
    Conflicts:
    	Makefile
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on May 11, 2014
  1. @elenril @lu-zero

    avconv: Support VDA hwaccel

    elenril authored lu-zero committed
    Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Commits on Apr 28, 2014
  1. @michaelni

    Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'

    michaelni authored
    * commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a':
      configure: rework dxva in avconv handling
    
    Conflicts:
    	Makefile
    	configure
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @michaelni

    Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'

    michaelni authored
    * commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
      avconv: add support for DXVA2 decoding
    
    Conflicts:
    	Makefile
    	configure
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  3. @elenril

    configure: rework dxva in avconv handling

    elenril authored
    Move the dxva check after the dependencies have been detected, make sure
    the ole32 library exists.
    
    Fixes build on non-Windows.
  4. @Nevcairiel @elenril

    avconv: add support for DXVA2 decoding

    Nevcairiel authored elenril committed
    Signed-off-by: Anton Khirnov <anton@khirnov.net>
Commits on Apr 7, 2014
  1. @michaelni

    Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

    michaelni authored
    * commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14':
      aarch64: add armv8 CPU flag
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Apr 6, 2014
  1. @jannau

    aarch64: add armv8 CPU flag

    jannau authored Janne Grunau committed
Commits on Apr 1, 2014
  1. @michaelni

    Makefile: fix out of tree builds of .m files

    michaelni authored
    should fix fate failures on darwin
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Mar 13, 2014
  1. @michaelni

    Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'

    michaelni authored
    * commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143':
      Remove all SPARC architecture optimizations
    
    Conflicts:
    	Makefile
    	configure
    	libavcodec/sparc/dsputil_vis.c
    	libavcodec/sparc/dsputil_vis.h
    	libavcodec/sparc/hpeldsp_vis.c
    	libavcodec/sparc/simple_idct_vis.c
    	libavcodec/sparc/vis.h
    	libswscale/sparc/yuv2rgb_vis.c
    	libswscale/swscale_internal.h
    
    If someone wants to maintain these (or other) SPARC optimizations, please
    contact me or ffmpeg-devel.
    I am happy to revert this removial if theres someone considering to
    maintain this code.
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @DonDiego

    Remove all SPARC architecture optimizations

    DonDiego authored
    SPARC is no longer being used in any multimedia-related fields and the
    VIS optimizations only represent a maintenance burden.
Commits on Feb 11, 2014
  1. @Cigaes
Commits on Dec 9, 2013
  1. @michaelni

    cmdutils & opencl: add -opencl_bench option to test and show availabl…

    Lenny Wang authored michaelni committed
    …e OpenCL devices
    
    Reviewed-by: Wei Gao <highgod0401@gmail.com>
    Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Dec 5, 2013
  1. @jamrial @michaelni

    Add Windows resource file support for shared libraries

    jamrial authored michaelni committed
    Originally written by James Almer <jamrial@gmail.com>
    
    With the following contributions by Timothy Gu <timothygu99@gmail.com>
    
    * Use descriptions of libraries from the pkg-config file generation function
    * Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser)
    * Use "FFmpeg" for ProductName as MSDN says "name of the product with which the
      file is distributed" [1].
    * Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1].
    * Only build the .rc files when --enable-small is not enabled.
    
    [1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx
    
    Signed-off-by: James Almer <jamrial@gmail.com>
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Dec 3, 2013
  1. @michaelni

    Makefile: add dependancies for ffversion.h

    michaelni authored
    It has to be build before the objects that use it
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Dec 2, 2013
  1. @DonDiego
  2. @DonDiego
Commits on Nov 30, 2013
  1. @michaelni

    Makefile: remove version.h on distclean

    michaelni authored
    Without this nothing will remove it even if it isnt generated in newer
    versions anymore.
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  2. @TimothyGu @michaelni

    build: rename version.h to libavutil/ffversion.h

    TimothyGu authored michaelni committed
    Also the libavutil/ffversion.h will be installed.
    
    Rationale:
    * Applications might want to know FFmpeg's version besides the individual
      libraries'.
    * Avoids file name clash between FFmpeg's ./version.h and lib*/version.h when
      a library source file includes both and is compiled on an out-of-tree build.
    
    Fixes #1769.
    
    Signed-off-by: Timothy Gu <timothygu99@gmail.com>
    Reviewed-by: James Almer <jamrial@gmail.com>
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Nov 27, 2013
  1. @michaelni

    Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'

    michaelni authored
    * commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c':
      Makefile: Fix building programs on systems with a nonempty executable suffix
    
    Conflicts:
    	Makefile
    
    See: f1db007
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Nov 26, 2013
  1. @mstorsjo

    Makefile: Fix building programs on systems with a nonempty executable…

    mstorsjo authored
    … suffix
    
    This fixes leftover issues from 14abeaa which caused make
    rules for programs to not match up properly when the executable
    suffix was nonempty.
    
    Signed-off-by: Martin Storsjö <martin@martin.st>
  2. @michaelni

    Makefile: Fix building progs out of progs_g

    michaelni authored
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  3. @michaelni

    Merge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c'

    michaelni authored
    * commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c':
      build: Integrate multilibrary examples into the build system
    
    Conflicts:
    	configure
    	doc/Makefile
    	doc/examples/muxing.c
    	doc/examples/output.c
    	libavformat/Makefile
    	libavformat/output-example.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  4. @michaelni

    Merge commit '14abeaa43d021afdce9119d906891abe89c03b88'

    michaelni authored
    * commit '14abeaa43d021afdce9119d906891abe89c03b88':
      build: Separate building programs linking against libav* from building av*
    
    Conflicts:
    	Makefile
    	doc/Makefile
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Nov 25, 2013
  1. @DonDiego

    build: Integrate multilibrary examples into the build system

    DonDiego authored
    This includes moving libavformat/output-example to doc/examples/output.
  2. @DonDiego

    build: Separate building programs linking against libav* from buildin…

    DonDiego authored
    …g av*
    
    This will allow cleaner integration of building example programs.
Something went wrong with that request. Please try again.