• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 46a47077
    Michael Niedermayer authored
    * qatar/master:
      configure: add functions for testing code fragments
      af_amix: avoid spurious EAGAIN.
      af_amix: return AVERROR(EAGAIN) when request_frame didn't produce output.
      af_amix: only consider negative return codes as errors.
      avconv: use only meaningful timestamps in start time check.
      avconv: fix the check for -ss as an output option.
      mss3: add forgotten 'static' qualifier for private table
      lavc: options: add planar names for request_sample_fmt
      flacdec: add planar output support
      flvdec: Treat all nellymoser versions as the same codec
    
    Conflicts:
    	ffmpeg.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    46a47077
flacdsp.h 1.22 KB