Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Aug 2012 12:23:08 +0000 (14:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Aug 2012 12:33:33 +0000 (14:33 +0200)
commit104f42e69485557a7d603047e1d29c44bbd12562
treef70179c1693b6fe212ac4090f49ea1ed843f92d4
parentc2271fa7f9a88afb374300c7320b57b870969926
parent7b44061f4be1075eefbc2eec649f38dd0dbfcc82
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/APIchanges: add an entry for codec descriptors.
  vorbisenc: set AVCodecContext.bit_rate to 0
  vorbisenc: fix quality parameter
  FATE: add ALAC encoding tests
  lpc: fix alignment of windowed samples for odd maximum LPC order
  alacenc: use s16p sample format as input
  alacenc: remove unneeded sample_fmt check
  alacenc: fix max_frame_size calculation for the final frame
  adpcm_swf: Use correct sample offsets when using trellis.
  rtmp: support strict rtmp servers
  mjpegdec: support AVRn interlaced
  x86: remove FASTDIV inline asm

Conflicts:
doc/APIchanges
libavcodec/mjpegdec.c
libavcodec/vorbisenc.c
libavutil/x86/intmath.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/adpcmenc.c
libavcodec/alacenc.c
libavcodec/lpc.c
libavcodec/lpc.h
libavcodec/mjpegdec.c
libavcodec/vorbisenc.c
libavformat/rtmpproto.c
tests/Makefile