Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Jul 2012 00:17:30 +0000 (02:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Jul 2012 00:17:30 +0000 (02:17 +0200)
* 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: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/flacdec.c
libavcodec/flacdsp.c
libavcodec/flacdsp.h
libavcodec/flacdsp_template.c
libavcodec/mss3.c
libavcodec/options_table.h
libavfilter/af_amix.c
libavformat/flvdec.c

diff --cc configure
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge