Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Dec 9, 2013
  1. @jamrial @michaelni

    common.mak: Less ugly version of the previous windres fix

    jamrial authored michaelni committed
    Using subst here is a really ugly hack
    
    Signed-off-by: James Almer <jamrial@gmail.com>
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  2. @jamrial @michaelni

    common.mak: fix the current fate failures with windres

    jamrial authored michaelni committed
    Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Dec 7, 2013
  1. @jamrial @michaelni

    windres: Track dependencies

    jamrial authored michaelni committed
    Signed-off-by: James Almer <jamrial@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 2, 2013
  1. @michaelni

    Merge commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276'

    michaelni authored
    * commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276':
      build: Add rule for building host-specific object files
    
    Conflicts:
    	Makefile
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @michaelni

    Merge commit 'ad477710244c761ad1c21246c34e0075fee12d11'

    michaelni authored
    * commit 'ad477710244c761ad1c21246c34e0075fee12d11':
      build: Add shorthand for HOSTCC compile macro
    
    Conflicts:
    	Makefile
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  3. @DonDiego
Commits on Nov 15, 2013
  1. @michaelni

    Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23'

    michaelni authored
    * commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23':
      build: Allow specifying extra object files when linking HOSTPROGS
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @DonDiego
Commits on Oct 4, 2013
  1. @michaelni

    Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'

    michaelni authored
    * commit '47b6cfc2a0333fb24f074d27830bf35ae5007050':
      avformat/output-example: Declare link dependency on libswscale in the Makefile
    
    Conflicts:
    	libavformat/Makefile
    
    Changes to libavformat/Makefile are not merged as our build system for the examples
    is different.
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Oct 3, 2013
  1. @DonDiego
Commits on Apr 5, 2013
  1. Integrate lcov/gcov into Libav

    Reinhard Tartler authored
    The gcov/lcov are a common toolchain for visualizing code coverage with
    the GNU/Toolchain. The documentation and implementation of this
    integration was heavily inspired from the blog entry by Mike Melanson:
    http://multimedia.cx/eggs/using-lcov-with-ffmpeg/
Commits on Mar 28, 2013
  1. @michaelni

    Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

    michaelni authored
    * commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975':
      ape: use correct context for the bit table printed in debug
      build: Move setting of SRC_DIR to the only place it is used
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Mar 27, 2013
  1. @DonDiego
Commits on Feb 24, 2013
  1. @michaelni

    Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'

    michaelni authored
    * commit '4cc4b33f71d3982df404fceb4405d656c538bc74':
      build: Add proper infrastructure for adding and checking host CPPFLAGS
    
    Conflicts:
    	Makefile
    	configure
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Feb 20, 2013
  1. @michaelni

    Merge commit '8a11ce43d08352f7a290355ebb5b29c495ad9609'

    michaelni authored
    * commit '8a11ce43d08352f7a290355ebb5b29c495ad9609':
      build: Ensure that output directories for header objects are created
      h264: Get rid of unnecessary casts
    
    Conflicts:
    	common.mak
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Feb 19, 2013
  1. @DonDiego
Commits on Dec 11, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      build: fix 'clean' target
      ZeroCodec: Flip output
    
    Conflicts:
    	libavcodec/version.h
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Dec 10, 2012
  1. @mansr

    build: fix 'clean' target

    mansr authored
    This fixes removal of TOOLS as well as HOSTPROGS declared in the
    top-level Makefile.  The clean target in common.mak needs to be
    eval'd since the variables used within are reset for each library.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Nov 23, 2012
  1. @michaelni

    Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'

    michaelni authored
    * commit '4a606c830ae664013cea33800094d4d0f4ec62da':
      av_memcpy_backptr: optimise some special cases
      mpegvideo: simplify dxy calculation in hpel_motion()
      build: add rules to generate preprocessed source files
    
    Conflicts:
    	Makefile
    	libavutil/mem.c
    	library.mak
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Oct 31, 2012
  1. @michaelni

    Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

    michaelni authored
    * commit '04581c8c77ce779e4e70684ac45302972766be0f':
      x86: yasm: Use complete source path for macro helper %includes
    
    Conflicts:
    	Makefile
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Oct 26, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      configure: sanitise sparc vis check
      configure: recognise more sparc variants as --cpu argument
      build: Include HEADERS-yes in the HEADERS variable
      pcm: change references to raw to pcm
      ffv1: set the range coder state in decode_slice_header
      pcmdec: change default of channels parameter to 1
    
    Conflicts:
    	libavformat/pcmdec.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Oct 25, 2012
  1. @mstorsjo

    build: Include HEADERS-yes in the HEADERS variable

    mstorsjo authored
    This makes sure the previously always installed public header
    lzo.h is installed if the LZO functionality is enabled.
    
    Signed-off-by: Martin Storsjö <martin@martin.st>
Commits on Sep 16, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      mpegvideo: drop unnecessary arguments to hpel_motion()
      mpegvideo: drop 'inline' from some functions
      nellymoserdec: drop support for s16 output.
      bmpdec: only initialize palette for pal8.
      build: Properly remove object files while cleaning
      flacdsp: arm optimised lpc filter
      compat/vsnprintf: return number of bytes required on truncation.
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Sep 15, 2012
  1. @mansr @dwbuiten

    build: Properly remove object files while cleaning

    mansr authored dwbuiten committed
    Previously, object files in, for example, compat/ were left
    after a clean or distclean was run.
    
    Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Commits on Aug 30, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      build: allow non-standard variations of linker -l/-L flags
      Add reminders to update the codec descriptor list with new codec IDs.
    
    Conflicts:
    	Makefile
    	configure
    	libavcodec/avcodec.h
    	libavformat/Makefile
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Aug 29, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      build: export filtered -lz flag in config.mak
      build: add separate setting for host linker
      configure: probe_cc: use separate variable for linker output flag
      x86: Always compile files with functions that are called unconditionally
      x86: mpegvideoenc: fix linking with --disable-mmx
      x86: mpegvideoenc: Do not abuse HAVE_ variables for template instantiation
    
    Conflicts:
    	Makefile
    	configure
    	libavcodec/x86/Makefile
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @mansr

    build: allow non-standard variations of linker -l/-L flags

    mansr authored
    This enables replacing the -l and -L flags used to specify the
    just-built libraries when linking the tools and shared libs with
    non-standard syntaxes.  System library flags are already handled
    by the filtering mechanism in configure.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Aug 28, 2012
  1. @mansr

    build: add separate setting for host linker

    mansr authored
    This adds new HOSTLD and related settings for host linker allowing
    it to be different from HOSTCC.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  2. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      vc1: export some functions
      configure: use HOSTCC_C/O in check_host_cc
      configure: use AS_O setting in check_as
      configure: use LD_O setting in check_ld()
      Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."
      build: Restore dependency of acelp_filters.o on celp_math.o
      celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()
      celp_math: Move ff_cos() to the only place it is used
      build: Use portable abstraction for linker/hostcc output file syntax
      configure: Fix shared library creation for OpenBSD
      vp56: Don't use DECLARE_ALIGN on a typedef name
      mss1: move code that will be reused by MSS2 decoder into separate file
      mss1: merge decode_intra() and decode_inter()
      avprobe: Get rid of ugly casts in the options table
      vf_hqdn3d: Remove a duplicate inline declaration
    
    Conflicts:
    	Makefile
    	configure
    	ffprobe.c
    	libavcodec/Makefile
    	libavcodec/amrnbdec.c
    	libavcodec/amrwbdec.c
    	libavcodec/celp_math.c
    	libavcodec/celp_math.h
    	libavcodec/dsputil.c
    	libavcodec/lsp.c
    	libavcodec/mss1.c
    	libavcodec/ra288.c
    	libavcodec/vc1dec.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Aug 27, 2012
  1. @DonDiego
Commits on Aug 9, 2012
  1. @jamrial @michaelni

    checkheaders: Rename HEADEROBJS to HOBJS

    jamrial authored michaelni committed
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  2. @michaelni

    common.mak: add forgotten hunk from last merge

    michaelni authored
    Found-by: jamal <jamrial@gmail.com>
    Author of the hunk: Mans Rullgard <mans@mansr.com>
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Aug 8, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master: (23 commits)
      build: cosmetics: Reorder some lists in a more logical fashion
      x86: pngdsp: Fix assembly for OS/2
      fate: add test for RTjpeg in nuv with frameheader
      rtmp: send check_bw as notification
      g723_1: clip argument for 15-bit version of normalize_bits()
      g723_1: use all LPC vectors in formant postfilter
      id3v2: Support v2.2 PIC
      avplay: fix build with lavfi disabled.
      avconv: split configuring filter configuration to a separate file.
      avconv: split option parsing into a separate file.
      mpc8: do not leave padding after last frame in buffer for the next decode call
      mpegaudioenc: list supported channel layouts.
      mpegaudiodec: don't print an error on > 1 frame in a packet.
      api-example: update to new audio encoding API.
      configure: add --enable/disable-random option
      doc: cygwin: Update list of FATE package requirements
      build: Remove all installed headers and header directories on uninstall
      build: change checkheaders to use regular build rules
      rtmp: Add a new option 'rtmp_subscribe'
      rtmp: Add support for subscribing live streams
      ...
    
    Conflicts:
    	Makefile
    	common.mak
    	configure
    	doc/examples/decoding_encoding.c
    	ffmpeg.c
    	libavcodec/g723_1.c
    	libavcodec/mpegaudiodec.c
    	libavcodec/x86/pngdsp.asm
    	libavformat/version.h
    	library.mak
    	tests/fate/video.mak
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Aug 7, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      x86: fix build with nasm 2.08
      x86: use nop cpu directives only if supported
      x86: fix rNmp macros with nasm
      build: add trailing / to yasm/nasm -I flags
      x86: use 32-bit source registers with movd instruction
      x86: add colons after labels
    
    Conflicts:
    	Makefile
    	libavutil/x86/x86inc.asm
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Something went wrong with that request. Please try again.