Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Aug 2012 13:31:43 +0000 (15:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Aug 2012 13:34:39 +0000 (15:34 +0200)
commit7427d1ca4ab202def24fc3cefc4401a351d7248c
treebe2cd06e1e5457daad74966a0155e86baa5e9086
parent0e05908c954ff64ef2fcb2a97ed083bc285282c1
parent0d230e9312a676266bd6fa3478032db4860221a7
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  g723.1: simplify scale_vector()
  g723.1: simplify normalize_bits()
  vda: cosmetics: fix Doxygen comment formatting
  vda: better frame allocation
  vda: Merge implementation into one file
  vda: support synchronous decoding
  vda: Reuse the bitstream buffer and reallocate it only if needed
  build: Factor out mpegvideo encoding dependencies to CONFIG_MPEGVIDEOENC
  avprobe: Include libm.h for the log2 fallback
  proresenc: use the edge emulation buffer
  rtmp: handle bytes read reports
  configure: Fix typo in mpeg2video/svq1 decoder dependency declaration
  Use log2(x) instead of log(x) / log(2)
  x86: swscale: fix fragile memory accesses
  x86: swscale: remove disabled code
  x86: yadif: fix asm with suncc
  x86: cabac: allow building with suncc
  x86: mlpdsp: avoid taking address of void
  ARM: intmath: use native-size return types for clipping functions

Conflicts:
configure
ffprobe.c
libavcodec/Makefile
libavcodec/g723_1.c
libavcodec/v210dec.h
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/x86/cabac.h
libavfilter/x86/yadif_template.c
libswscale/x86/rgb2rgb_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
configure
ffmpeg.c
ffprobe.c
libavcodec/Makefile
libavcodec/g723_1.c
libavcodec/imc.c
libavcodec/snowenc.c
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/version.h
libavcodec/x86/cabac.h
libavcodec/x86/h264_i386.h
libavcodec/x86/mlpdsp.c
libavfilter/x86/yadif_template.c
libavformat/rtmpproto.c
libavutil/arm/intmath.h
libswscale/x86/rgb2rgb_template.c