Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Oct 2011 23:02:45 +0000 (01:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Oct 2011 23:02:45 +0000 (01:02 +0200)
commit487e088e5e7f4cade6bce5e9a3cff28fce303af1
treeb11de275564c0afeb4166c97acf6a9b4e0995dba
parentcffd20b90ee6f35e37cdb51dd94e6b2174fd31b6
parent5674d4b0a35a34b75e3533a8580e0b5a0a8895a7
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpc8: check output buffer size before decoding
  mpc7: return error if packet is too small.
  mpc7: check output buffer size before decoding
  nellymoserdec: allocate float_buf only when decoding to int16
  nellymoserdec: use NELLY_BUF_LEN instead of 128
  nellymoserdec: use NELLY_BLOCK_LEN instead of 64 when appropriate.
  nellymoserdec: allow user to request SAMPLE_FMT_FLT for output samples.
  nellymoser: check output buffer size before decoding
  win32: improve threading algorithm warning

Conflicts:
libavcodec/nellymoserdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpc7.c
libavcodec/mpc8.c
libavcodec/nellymoserdec.c
libavcodec/w32thread.c