Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Mar 2012 01:28:40 +0000 (02:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Mar 2012 01:51:45 +0000 (02:51 +0100)
commitbf807a5e874442aa3fe1b475459cdd509e34bff4
treef8067bfb5e99b8b8e2716a7ea8519a4aaa8ac60f
parent4cda8aa1c5bc58f8a7f53a21a19b03e7379bbcdc
parent6eda85e15b38863a627fd0602098aa3250174698
Merge remote-tracking branch 'qatar/master'

* qatar/master: (29 commits)
  sbrdsp.asm: convert all instructions to float/SSE ones.
  dv: cosmetics.
  dv: check buffer size before reading profile.
  Revert "AAC SBR: group some writes."
  udp: Print an error message if bind fails
  cook: extend channel uncoupling tables so the full bit range is covered.
  roqvideo: cosmetics.
  roqvideo: convert to bytestream2 API.
  dca: don't use av_clip_uintp2().
  wmall: fix build with -DDEBUG enabled.
  smc: port to bytestream2 API.
  AAC SBR: group some writes.
  dsputil: remove shift parameter from scalarproduct_int16
  SBR DSP: unroll sum_square
  rv34: remove dead code in intra availability check
  rv34: clean a bit availability checks.
  v4l2: update documentation
  tgq: convert to bytestream2 API.
  parser: remove forward declaration of MpegEncContext
  dca: prevent accessing static arrays with invalid indexes.
  ...

Conflicts:
doc/indevs.texi
libavcodec/Makefile
libavcodec/dca.c
libavcodec/dvdata.c
libavcodec/eatgq.c
libavcodec/mmvideo.c
libavcodec/roqvideodec.c
libavcodec/smc.c
libswscale/output.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
37 files changed:
doc/indevs.texi
libavcodec/Makefile
libavcodec/acelp_pitch_delay.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/int_neon.S
libavcodec/cook.c
libavcodec/cookdata.h
libavcodec/dca.c
libavcodec/dcadata.h
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dvdata.c
libavcodec/eatgq.c
libavcodec/g729postfilter.c
libavcodec/mmvideo.c
libavcodec/parser.h
libavcodec/pcm-mpeg.c
libavcodec/rawdec.c
libavcodec/roqvideo.h
libavcodec/roqvideodec.c
libavcodec/rv34.c
libavcodec/smc.c
libavcodec/vc1.c
libavcodec/vc1.h
libavcodec/vc1acdata.h
libavcodec/vc1data.c
libavcodec/vc1data.h
libavcodec/vc1dec.c
libavcodec/wma.c
libavcodec/wma.h
libavcodec/wmalosslessdec.c
libavcodec/wmaprodec.c
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/h264_qpel_mmx.c
libavformat/smacker.c
libavformat/udp.c
libswscale/output.c