Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jul 2012 19:04:06 +0000 (21:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jul 2012 19:25:09 +0000 (21:25 +0200)
commit2cb4d516549526b5e17e941f6d2375a2c501ade6
treef472c62e0b34c2faaa955d51874cddb6be759910
parent7e15df7551cf45ad1d3e39d20fdc8d6c651d4705
parentd04c5293ce88927ad359ca276e287bfa63c2329d
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  v410dec: Implement explode mode support
  zerocodec: fix direct rendering.
  wav: init st to NULL to avoid a false-positive warning.
  wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit
  h264: refactor NAL decode loop
  RTMPTE protocol support
  RTMPE protocol support
  rtmp: Add ff_rtmp_calc_digest_pos()
  rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global
  swscale: add missing HAVE_INLINE_ASM check.
  lavfi: place x86 inline assembly under HAVE_INLINE_ASM.
  vc1: Add a test for interlaced field pictures
  swscale: Mark all init functions as av_cold
  swscale: x86: Drop pointless _mmx suffix from filenames
  lavf: use conditional notation for default codec in muxer declarations.
  swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM.
  dsputil: ppc: cosmetics: pretty-print
  dsputil: x86: add SHUFFLE_MASK_W macro
  configure: respect CC_O setting in check_cc

Conflicts:
Changelog
configure
libavcodec/v410dec.c
libavcodec/zerocodec.c
libavformat/asfenc.c
libavformat/version.h
libswscale/utils.c
libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
38 files changed:
Changelog
configure
doc/general.texi
doc/protocols.texi
libavcodec/h264.c
libavcodec/ppc/fmtconvert_altivec.c
libavcodec/v410dec.c
libavcodec/x86/dsputil_yasm.asm
libavcodec/zerocodec.c
libavfilter/x86/gradfun.c
libavfilter/x86/yadif.c
libavformat/Makefile
libavformat/allformats.c
libavformat/avienc.c
libavformat/flvenc.c
libavformat/matroskaenc.c
libavformat/movenc.c
libavformat/nutenc.c
libavformat/rtmp.h
libavformat/rtmpcrypt.c
libavformat/rtmpcrypt.h
libavformat/rtmpdh.c
libavformat/rtmpdh.h
libavformat/rtmpproto.c
libavformat/version.h
libavutil/x86/x86util.asm
libswscale/output.c
libswscale/ppc/swscale_altivec.c
libswscale/ppc/yuv2rgb_altivec.c
libswscale/rgb2rgb.c
libswscale/sparc/yuv2rgb_vis.c
libswscale/swscale.c
libswscale/utils.c
libswscale/x86/Makefile
libswscale/x86/rgb2rgb.c
libswscale/x86/swscale.c
libswscale/x86/yuv2rgb.c
tests/fate/microsoft.mak