1. 29 May, 2011 6 commits
    • Reimar Döffinger's avatar
      Add const to vector types for input in altivec code. · 89c687e9
      Reimar Döffinger authored
      Avoids a large amount of warnings about cast discarding qualifiers.
      89c687e9
    • Reimar Döffinger's avatar
      4596d0f4
    • Reimar Döffinger's avatar
      Cast pointers to uintptr_t rather than unsigned int. · 54dc9563
      Reimar Döffinger authored
      Avoids potential warnings on PPC64 systems.
      54dc9563
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' into master · b8a43bc1
      Michael Niedermayer authored
      * qatar/master: (27 commits)
        ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits()
        ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits.
        ac3dsp: fix loop condition in ac3_update_bap_counts_c()
        ARM: unbreak build
        ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4.
        ac3enc: split mantissa bit counting into a separate function.
        ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct.
        get_bits: add av_unused tag to cache variable
        sws: replace all long with int.
        ARM: aacdec: fix constraints on inline asm
        ARM: remove unnecessary volatile from inline asm
        ARM: add "cc" clobbers to inline asm where needed
        ARM: improve FASTDIV asm
        ac3enc: use LOCAL_ALIGNED macro
        APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7).
        lavu: add av_get_pix_fmt_name() convenience function
        cmdutils: remove OPT_FUNC2
        swscale: fix crash in bilinear scaling.
        vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping
        webm: support stereo videos in matroska/webm muxer
        ...
      
      Conflicts:
      	Changelog
      	cmdutils.c
      	cmdutils.h
      	doc/APIchanges
      	doc/muxers.texi
      	ffmpeg.c
      	ffplay.c
      	libavcodec/ac3enc.c
      	libavcodec/ac3enc_float.c
      	libavcodec/avcodec.h
      	libavcodec/get_bits.h
      	libavcodec/libvpxenc.c
      	libavcodec/version.h
      	libavdevice/libdc1394.c
      	libavformat/matroskaenc.c
      	libavutil/avutil.h
      	libswscale/rgb2rgb.c
      	libswscale/swscale.c
      	libswscale/swscale_template.c
      	libswscale/x86/swscale_template.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      b8a43bc1
    • Michael Niedermayer's avatar
      swscale: Commits that could not be pulled earlier due to bugs #2 · 39d607e5
      Michael Niedermayer authored
      commit 5a5a0f16
      Author: Diego Biurrun <diego@biurrun.de>
      Date:   Fri May 27 19:46:39 2011 +0200
      
          swscale: Remove unused variables in x86 code.
      
          libswscale/x86/swscale_template.c:2072: warning: unused variable ‘canMMX2BeUsed’
          libswscale/x86/swscale_template.c:2145: warning: unused variable ‘canMMX2BeUsed’
          libswscale/x86/swscale_template.c:2209: warning: unused variable ‘chrVPixBuf’
          libswscale/x86/swscale_template.c:2237: warning: unused variable ‘chrVSrcPtr’
      
      commit 389e2000
      Author: Ronald S. Bultje <rsbultje@gmail.com>
      Date:   Fri May 27 12:23:32 2011 -0400
      
          swscale: delay allocation of formatConvBuffer().
      
          That means it won't be allocated when not needed. Alongside
          this, it fixes valgrind/fate-detected memory leaks.
      
      commit f327bfa6
      Author: Ronald S. Bultje <rsbultje@gmail.com>
      Date:   Fri May 27 11:36:43 2011 -0400
      
          swscale: fix build with --disable-swscale-alpha.
      
      commit 9f5d4502
      Author: Ronald S. Bultje <rsbultje@gmail.com>
      Date:   Fri May 27 09:28:38 2011 -0400
      
          swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.
      39d607e5
    • Michael Niedermayer's avatar
      Commits that could not be pulled earlier due to bugs. · 986f0d86
      Michael Niedermayer authored
          commit 93681fbd
          Author: Ronald S. Bultje <rsbultje@gmail.com>
          Date:   Thu May 26 11:32:32 2011 -0400
      
              swscale: fix compile on ppc.
      
          commit e758573a
          Author: Ronald S. Bultje <rsbultje@gmail.com>
          Date:   Thu May 26 10:36:47 2011 -0400
      
              swscale: fix compile on x86-32.
      
          commit 0f4eb8b0
          Author: Ronald S. Bultje <rsbultje@gmail.com>
          Date:   Thu May 26 09:17:52 2011 -0400
      
              swscale: remove VOF/VOFW.
      
          commit b4a224c5
          Author: Ronald S. Bultje <rsbultje@gmail.com>
          Date:   Wed May 25 14:30:09 2011 -0400
      
              swscale: split chroma buffers into separate U/V planes.
      
              Preparatory step to implement support for sizes > VOFW.
      986f0d86
  2. 28 May, 2011 34 commits