Merge remote-tracking branch 'qatar/master' into master
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 May 2011 00:55:19 +0000 (02:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 May 2011 01:34:35 +0000 (03:34 +0200)
commitb8a43bc1b50f409414493a05f6c4b7895ca4ddf9
tree95dda1b7289aac9bdb1f457417baf9515aa4383a
parent39d607e5bbc25ad9629683702b510e865434ef21
parent90da52f01f8b6c22af22a002eb226989b1cf7ef8
Merge remote-tracking branch 'qatar/master' into master

* 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: Michael Niedermayer <michaelni@gmx.at>
42 files changed:
Changelog
configure
doc/APIchanges
doc/general.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/ac3dsp.c
libavcodec/ac3dsp.h
libavcodec/ac3enc.c
libavcodec/ac3enc_combined.c
libavcodec/ac3enc_float.c
libavcodec/allcodecs.c
libavcodec/arm/aac.h
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/mathops.h
libavcodec/arm/vp56_arith.h
libavcodec/x86/ac3dsp.asm
libavcodec/x86/ac3dsp_mmx.c
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavformat/avformat.h
libavformat/matroska.h
libavformat/rawdec.c
libavformat/rawdec.h
libavutil/arm/intmath.h
libavutil/pixdesc.h
libswscale/bfin/internal_bfin.S
libswscale/bfin/swscale_bfin.c
libswscale/colorspace-test.c
libswscale/ppc/swscale_altivec_template.c
libswscale/ppc/swscale_template.c
libswscale/ppc/yuv2rgb_altivec.c
libswscale/rgb2rgb.c
libswscale/rgb2rgb.h
libswscale/rgb2rgb_template.c
libswscale/swscale.c
libswscale/swscale.h
libswscale/swscale_internal.h
libswscale/swscale_template.c
libswscale/utils.c
libswscale/x86/rgb2rgb_template.c
libswscale/x86/swscale_template.c