Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 28, 2013
  1. @michaelni

    Merge commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3'

    michaelni authored
    * commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3':
      LICENSE: Move (L)GPLv3 explanation block to a more suitable place
      swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Aug 16, 2012
  1. @michaelni

    LICENSE: correct incorrect claims on *GPL incompatibility

    michaelni authored
    There are currently no statements from any person qualified in the art
    of law about the LGPL compatibility of the libfaac license and others.
    Furthermore their is no consensus about their compatibility amongth
    people not qualified in the art.
    
    Also of interrest may be that ubuntu distributes and links libfaac
    to LGPL code. And the ubuntu technical comittee decision about libfaac
    https://lists.ubuntu.com/archives/technical-board/2011-February/000703.html
    
    Comments and other viewpoints, especially if i have missed something
    are very welcome!
    
    Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
    Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Aug 13, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master: (22 commits)
      g723.1: do not pass large structs by value
      g723.1: do not bounce intermediate values via memory
      g723.1: declare a variable in the block it is used
      g723.1: avoid saving/restoring excitation
      g723.1: avoid unnecessary memcpy() in residual_interp()
      g723.1: make postfilter write directly to output buffer
      g723.1: drop unnecessary variable buf_ptr in formant_postfilter()
      g723.1: make scale_vector() output to a separate buffer
      g723.1: make autocorr_max() work on an arbitrary buffer
      g723.1: do not needlessly use int64_t
      g723.1: use saturating addition functions
      g723.1: optimise scale_vector()
      g723.1: remove useless uses of MUL64()
      g723.1: remove unnecessary argument 'shift' from dot_product()
      g723.1: deobfuscate "(x << 4) - x" to "15 * x"
      celp: optimise ff_celp_lp_synthesis_filter()
      libavutil: add saturating addition functions
      cllc: Implement ARGB support
      cllc: Add support for QRGB
      cllc: Rename some funcs to represent what they actually do
      ...
    
    Conflicts:
    	LICENSE
    	libavcodec/g723_1.c
    	libavcodec/x86/Makefile
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Aug 3, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      vc1dec: Remove separate scaling function for interlaced field MVs
      vc1dec: Invoke edge_emulation regardless of MV precision
      x86: Use consistent 3dnowext function and macro name suffixes
      g723_1: scale output as supposed for the case with postfilter disabled
      g723_1: increase excitation storage by 4
      g723_1: fix upper bound parameter from inverse maximum autocorrelation
      g723_1: make scale_vector() behave like the reference
      g723_1: fix off-by-one error in normalize_bits()
      g723_1: save/restore excitation with offset to store LPC history
      wmapro: prevent division by zero when sample rate is unspecified
      x86: proresdsp: improve SIGNEXTEND macro comments
      x86: h264dsp: K&R formatting cosmetics
      LICENSE: Document all GPL files
    
    Conflicts:
    	libavcodec/g723_1.c
    	libavcodec/wmaprodec.c
    	libavcodec/x86/h264dsp_mmx.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Feb 22, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      mpegvideo_enc: only allocate output packet when we know there will be output
      Add names for more channel layouts to the channel layout map.
      sunrast: Add a sample request for RMP_RAW colormap.
      avcodec: do not override pts or duration from the audio encoder
      Add prores regression test.
      Enable already existing rso regression test.
      Add regression test for "sox" format muxer/demuxer.
      Add dpx encoding regression test.
      swscale: K&R formatting cosmetics for PowerPC code (part I/II)
      img2: Use ff_guess_image2_codec(filename) shorthand where appropriate.
      Clarify licensing information about files borrowed from libjpeg.
      Mark mutable static data const where appropriate.
      avplay: fix -threads option
      dvbsubdec: avoid undefined signed left shift in RGBA macro
      mlpdec: use av_log_ask_for_sample()
      gif: K&R formatting cosmetics
      png: make .long_name more descriptive
      movdec: Adjust keyframe flagging in fragmented files
      rv34: change most "int stride" into "ptrdiff_t stride".
    
    Conflicts:
    	avprobe.c
    	ffplay.c
    	libavcodec/mlpdec.c
    	libavcodec/mpegvideo_enc.c
    	libavcodec/pngenc.c
    	libavcodec/x86/v210-init.c
    	libavfilter/vf_boxblur.c
    	libavfilter/vf_crop.c
    	libavfilter/vf_drawtext.c
    	libavfilter/vf_lut.c
    	libavfilter/vf_overlay.c
    	libavfilter/vf_pad.c
    	libavfilter/vf_scale.c
    	libavfilter/vf_select.c
    	libavfilter/vf_setpts.c
    	libavfilter/vf_settb.c
    	libavformat/img2.c
    	libavutil/audioconvert.c
    	tests/codec-regression.sh
    	tests/lavf-regression.sh
    	tests/ref/lavf/dpx
    	tests/ref/vsynth1/prores
    	tests/ref/vsynth2/prores
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Mar 17, 2011
  1. @michaelni

    Revert "partially rename FFmpeg to Libav"

    michaelni authored
    This reverts commit 070c5d0.
Something went wrong with that request. Please try again.