Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 31 Mar 2012 22:36:43 +0000 (00:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 31 Mar 2012 22:36:43 +0000 (00:36 +0200)
commit2f7bd3b5162c240e62c11cf0373342fa89f26c8f
tree1d0f0aeb6b2c6acc811f11eca9fbeb16c451ea2c
parent5216245a2c5ed8140d99f14fcc148fbb6db9831e
parent420d1df2e2a857eae45fa947e16eae7494793d57
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  apedec: check bits <= 32.
  cavs: Remove unused code.
  oggenc: fix condition when not to flush due to keyframe granule.
  oggenc: add pagesize option to set preferred page size
  libspeexdec: set frame size in libspeex_decode_init()
  smacker audio: sign-extend the initial 16-bit predicted value

Conflicts:
libavcodec/apedec.c
libavcodec/libspeexdec.c
libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/apedec.c
libavcodec/cavs.c
libavcodec/libspeexdec.c
libavcodec/smacker.c
libavformat/oggenc.c