• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 487e088e
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    487e088e
nellymoserdec.c 7.54 KB