Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 19, 2011
  1. @michaelni

    Add libswresample.

    michaelni authored
    Similar to libswscale this does resampling and format convertion, just for audio
    instead of video.
    changing sampling rate, sample formats, channel layouts and sample packing all
    in one with a very simple public interface.
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Sep 13, 2011
  1. @michaelni

    Merge remote-tracking branch 'hexene/scratchpad'

    michaelni authored
    * hexene/scratchpad:
      Move & Rename buildscript, remove tabs
      Fix regular build
      Support (H/W accelerated) H.264 decoding on Android via Stagefright
      Add build-script for Android
      C++ Support ;)
    
    Conflicts:
    	Changelog
    	Makefile
    	configure
    	libavcodec/Makefile
    	libavcodec/allcodecs.c
    	libavcodec/version.h
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Aug 15, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      Fix NASM include directive
      dsputil_mmx: Honor HAVE_AMD3DNOW
      lavf,lavd: remove all usage of AVFormatParameters from demuxers.
      jack: add 'channels' private option.
      VC-1: fix reading of custom PAR.
      Remove redundant and dubious video codec detection by its extradata
      mpeg12: remove repeat-field code disabled since May 2002
      patch checklist: suggest fate instead of regression tests
      Turn on resampling on sudden size change instead of bailing out during recode.
      avtools: reinitialise filter chain when input video stream changes dimensions
    
    Conflicts:
    	Makefile
    	avconv.c
    	doc/developer.texi
    	ffplay.c
    	libavcodec/x86/dsputil_mmx.c
    	libavdevice/libdc1394.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jul 21, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      rv30: return AVERROR(EINVAL) instead of EINVAL
      build: add -L flags before existing LDFLAGS
      simple_idct: whitespace cosmetics
      simple_idct: make repeated code a macro
      dsputil: remove huge #if 0 block
      simple_idct: change 10-bit add/put stride from pixels to bytes
      dsputil: allow 9/10-bit functions for non-h264 codecs
      dnxhd: rename some data tables
      dnxhdenc: remove inline from function only called through pointer
      dnxhdenc: whitespace cosmetics
      swscale: mark YUV422P10(LE,BE) as supported for output
      configure: add -xc99 to LDFLAGS for Sun CC
      Remove unused and non-compiling vestigial g729 decoder
      Remove unused code under G729_BITEXACT #ifdef.
      mpegvideo: fix invalid picture unreferencing.
      dsputil: Remove extra blank line at end.
      dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT.
      simple_idct: add 10-bit version
    
    Conflicts:
    	Makefile
    	libavcodec/g729data.h
    	libavcodec/g729dec.c
    	libavcodec/rv30.c
    	tests/ref/lavfi/pixdesc
    	tests/ref/lavfi/pixfmts_copy
    	tests/ref/lavfi/pixfmts_null
    	tests/ref/lavfi/pixfmts_scale
    	tests/ref/lavfi/pixfmts_vflip
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jul 11, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      changelog: misc typo and wording fixes
      H.264: add filter_mb_fast support for >8-bit decoding
      doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
      lls: use av_lfg instead of rand() in test program
      build: remove unnecessary dependency on libs from 'all' target
      H.264: avoid redundant alpha/beta calculations in loopfilter
      H.264: optimize intra/inter loopfilter decision
      mpegts: fix Continuity Counter error detection
      build: remove unnecessary FFLDFLAGS variable
      vp8/mt: flush worker thread, not application thread context, on seek.
      mt: proper locking around release_buffer calls.
      DxVA2: unbreak build after [657ccb5]
      hwaccel: unbreak build
      Eliminate FF_COMMON_FRAME macro.
    
    Conflicts:
    	Changelog
    	Makefile
    	doc/developer.texi
    	libavcodec/avcodec.h
    	libavcodec/h264.c
    	libavcodec/mpeg4videodec.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @mansr

    build: remove unnecessary FFLDFLAGS variable

    mansr authored
    This variable is set to the same value for all directories.
    Adding the -L flags directly to LDFLAGS is simpler and achieves
    the same thing.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  3. @michaelni

    Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'

    michaelni authored
    * commit '142e76f1055de5dde44696e71a5f63f2cb11dedf':
      swscale: fix crash with dithering due incorrect offset calculation.
      matroskadec: fix stupid typo (!= -> ==)
      build: remove duplicates from order-only directory prerequisite list
      build: rework rules for things in the tools dir
      configure: fix --cpu=host with gcc 4.6
      ARM: use const macro to define constant data in asm
      bitdepth: simplify FUNC/FUNCC macros
      dsputil: remove ff_emulated_edge_mc macro used in one place
      9/10-bit: simplify clipping macros
      matroskadec: reindent
      matroskadec: defer parsing of cues element until we seek.
      lavc: add support for codec-specific defaults.
      lavc: make avcodec_alloc_context3 officially public.
      lavc: remove a half-working attempt at different defaults for audio/video codecs.
      ac3dec: add a drc_scale private option
      lavf: add avformat_find_stream_info()
      lavc: introduce avcodec_open2() as a replacement for avcodec_open().
    
    Conflicts:
    	Makefile
    	libavcodec/utils.c
    	libavformat/avformat.h
    	libswscale/swscale_internal.h
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jul 10, 2011
  1. @DonDiego

    build: remove duplicates from order-only directory prerequisite list

    DonDiego authored
    This reduces startup latency for make invocations, which is especially
    noticeable on systems that are slow or have slow I/O, like Windows.
  2. @mansr

    build: rework rules for things in the tools dir

    mansr authored
    Declaring tools associated with each library in their respective
    makefiles allows these tools to easily depend on the correct
    prerequisites and link against the libs they need.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Jun 30, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      rational-test: Add proper main() declaration to fix gcc warnings.
      configure: Add vdpau and dxva2 to configure results output.
      Remove unused, never built libavutil/pca.[ch]
      matroskadec: forward parsing errors to caller.
      av_find_stream_info: simplify EAGAIN handling.
      aacenc: Fix determination of Mid/Side Mode.
      psymodel: Remove the single channel analysis function
      aacenc: Implement dummy channel group analysis that just calls the single channel analysis for each channel.
      psymodel: Add channels and channel groups to the psymodel.
      ARM: remove check for PLD instruction
      fate: move amr[nw]b test rules into separate files
      ogg: fix double free when finding length of small chained oggs.
      swscale: implement >8bit scaling support.
      build: fix creation of tools dir with make 3.81
      build: Mark all-yes Makefile target as phony.
      pixfmt: fix YUV422/444 wrong endian comment
      build: create output directories as needed
      Add new yuv444 pixfmts to avcodec_align_dimensions2
    
    Conflicts:
    	Makefile
    	configure
    	libavutil/pca.c
    	libavutil/pca.h
    	libavutil/pixfmt.h
    	libswscale/swscale.c
    	libswscale/utils.c
    	libswscale/x86/swscale_template.c
    	tests/ref/lavfi/pixdesc
    	tests/ref/lavfi/pixfmts_copy
    	tests/ref/lavfi/pixfmts_null
    	tests/ref/lavfi/pixfmts_scale
    	tests/ref/lavfi/pixfmts_vflip
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jun 29, 2011
  1. @mansr

    build: create output directories as needed

    mansr authored
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  2. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master: (21 commits)
      swscale: Add Doxygen for hyscale_fast/hScale.
      fate: enable lavfi-pixmt tests on big endian systems
      PPC: swscale: disable altivec functions for unsupported formats
      fate: merge identical pixdesc_be/le tests
      swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
      build: call texi2pod.pl with full path instead of symlink
      build: include sub-makefiles using full path instead of symlinks
      swscale: update big endian reference values after dff5a83.
      wavpack: skip blocks with no samples
      cosmetics: remove outdated comment that is no longer true
      build: replace some addprefix/addsuffix with substitution refs
      avutil: Remove unused arbitrary precision integer code.
      configure: Drop check for availability of ten assembler operands.
      aacenc: Save channel configuration for later use.
      aacenc: Fix codebook trellising for zeroed bands.
      swscale: change prototypes of scaled YUV output functions.
      swscale: re-add support for non-native endianness.
      swscale: disentangle yuv2rgbX_c_full() into small functions.
      swscale: split yuv2packed[12X]_c() remainders into small functions.
      swscale: split yuv2packedX_altivec in smaller functions.
      ...
    
    Conflicts:
    	Makefile
    	configure
    	libavcodec/x86/dsputil_mmx.c
    	libavfilter/Makefile
    	libavformat/Makefile
    	libavutil/integer.c
    	libavutil/integer.h
    	libswscale/swscale.c
    	libswscale/swscale_internal.h
    	libswscale/x86/swscale_template.c
    	tests/ref/lavfi/pixdesc_le
    	tests/ref/lavfi/pixfmts_scale
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jun 28, 2011
  1. @mansr

    build: replace some addprefix/addsuffix with substitution refs

    mansr authored
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Jun 27, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      build: improve rules for test programs
      build: factor out the .c and .S compile commands as a macro
      swscale: remove unused xInc/srcW arguments from hScale().
      H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
      H.264: make filter_mb_fast support 4:4:4
      mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().
      configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag.
      Move some variable declarations below the proper #ifdefs.
    
    Conflicts:
    	Makefile
    	ffplay.c
    	libswscale/swscale.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jun 25, 2011
  1. Fix compilation in subdir with NASM.

    Reimar Döffinger authored
    Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
  2. Restore some more rules to common.mak to improve building in subdirs.

    Reimar Döffinger authored
    Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Commits on Jun 24, 2011
  1. Restore accidentally removed parts of "BRIEF" list.

    Reimar Döffinger authored
    Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
  2. Allow running make in subdirs again.

    Reimar Döffinger authored
  3. Revert "build: move basic rules and variables to main Makefile"

    Reimar Döffinger authored
    This reverts commit bb52492.
    This is necessary to allow running "make" in subdirs again.
    
    Conflicts:
    
    	Makefile
Commits on Jun 23, 2011
  1. @mansr

    build: move basic rules and variables to main Makefile

    mansr authored
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  2. @mansr

    build: move special targets to end of main Makefile

    mansr authored
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Jun 14, 2011
  1. @mansr

    build: move vpath directives to main Makefile

    mansr authored
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  2. @mansr

    build: move ALLFFLIBS to a more logical place

    mansr authored
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Jun 7, 2011
  1. @mansr

    build: remove empty $(OBJS) target

    mansr authored
    This target was added to prevent some files being deleted
    by make when using chains of implicit rules.  This is no
    longer required.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Jun 6, 2011
  1. @mansr

    build: clean up .PHONY lists

    mansr authored
    This removes nonexisting targets from phony lists and puts them
    all in one place.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  2. @mansr

    build: move all (un)install* target aliases to toplevel Makefile

    mansr authored
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  3. @mansr

    build: remove stale dependency

    mansr authored
    This dependency is implicitly covered elsewhere.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
  4. @mansr

    build: do not add CFLAGS-yes to CFLAGS

    mansr authored
    CFLAGS-yes is never set so this serves no purpose.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on May 29, 2011
  1. @mansr

    build: remove BUILD_ROOT variable

    mansr authored
    This variable is unnecessary as absolute paths are not required.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Mar 31, 2011
  1. @mansr

    Include dependencies for test programs

    mansr authored
    This makes sure the various *-test programs are correctly rebuilt
    when necessary.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Mar 29, 2011
  1. @mansr

    Remove support for stripping executables

    mansr authored
    Stripping is generally best left to package management tools, and
    since unstripped copies are kept in the build tree, any arguments
    about saving space (no matter how insignificant) are void.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Feb 15, 2011
  1. Merge libavcore into libavutil

    Reinhard Tartler authored
    It is pretty hopeless that other considerable projects will adopt
    libavutil alone in other projects. Projects that need small footprint
    are better off with more specialized libraries such as gnulib or rather
    just copy the necessary parts that they need. With this in mind, nobody
    is helped by having libavutil and libavcore split. In order to ease
    maintenance inside and around FFmpeg and to reduce confusion where to
    put common code, avcore's functionality is merged (back) to avutil.
    
    Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Commits on Sep 3, 2010
  1. @mansr

    Create config.asm for use with yasm

    mansr authored
    Originally committed as revision 25039 to svn://svn.ffmpeg.org/ffmpeg/trunk
Commits on Aug 17, 2010
  1. @DonDiego

    Remove dep/depend targets and related variables.

    DonDiego authored
    We no longer create dependency files directly, so the rules are now pointless.
    
    Originally committed as revision 24807 to svn://svn.ffmpeg.org/ffmpeg/trunk
Something went wrong with that request. Please try again.