Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Jul 2012 20:10:38 +0000 (22:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Jul 2012 20:40:12 +0000 (22:40 +0200)
commitf8911b987de4a84ff8ae92f41ff492ece4acadb9
tree0ebda51a6ba23d790da30a7168870928954da395
parentbf5386385dc504a076453ad58f61f808677be747
parent5467742232c312b7d61dca7ac57447f728d8d6c9
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mss3: use standard zigzag table
  mss3: split DSP functions that are used in MTS2(MSS4) into separate file
  motion-test: do not use getopt()
  tcp: add initial timeout limit for incoming connections
  configure: Change the rdtsc check to a linker check
  avconv: propagate fatal errors from lavfi.
  lavfi: add error handling to filter_samples().
  fate-run: make avconv() properly deal with multiple inputs.
  asplit: don't leak the input buffer.
  af_resample: fix request_frame() behavior.
  af_asyncts: fix request_frame() behavior.
  libx264: support aspect ratio switching
  matroskadec: honor error_recognition when encountering unknown elements.
  lavr: resampling: add support for s32p, fltp, and dblp internal sample formats
  lavr: resampling: add filter type and Kaiser window beta to AVOptions
  lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format
  lavr: mix: validate internal sample format in ff_audio_mix_init()

Conflicts:
ffmpeg.c
ffplay.c
libavcodec/libx264.c
libavfilter/audio.c
libavfilter/split.c
libavformat/tcp.c
tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
38 files changed:
libavcodec/Makefile
libavcodec/libx264.c
libavcodec/motion-test.c
libavcodec/mss3.c
libavcodec/mss34dsp.c
libavcodec/mss34dsp.h
libavfilter/af_aconvert.c
libavfilter/af_amerge.c
libavfilter/af_amix.c
libavfilter/af_aresample.c
libavfilter/af_asetnsamples.c
libavfilter/af_ashowinfo.c
libavfilter/af_astreamsync.c
libavfilter/af_asyncts.c
libavfilter/af_atempo.c
libavfilter/af_channelmap.c
libavfilter/af_channelsplit.c
libavfilter/af_earwax.c
libavfilter/af_pan.c
libavfilter/af_silencedetect.c
libavfilter/af_volume.c
libavfilter/asink_anullsink.c
libavfilter/audio.c
libavfilter/audio.h
libavfilter/avf_showwaves.c
libavfilter/avfilter.h
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/f_settb.c
libavfilter/fifo.c
libavfilter/internal.h
libavfilter/sink_buffer.c
libavfilter/split.c
libavformat/matroskadec.c
libavformat/tcp.c
libavresample/resample_template.c
libavresample/utils.c
tests/fate-run.sh