• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · f8911b98
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f8911b98
Name
Last commit
Last update
..
fate Loading commit data...
ref Loading commit data...
Makefile Loading commit data...
asynth1.sw Loading commit data...
audiogen.c Loading commit data...
base64.c Loading commit data...
copycooker.sh Loading commit data...
fate-run.sh Loading commit data...
fate-update.sh Loading commit data...
fate-valgrind.supp Loading commit data...
fate.sh Loading commit data...
fate_config.sh.template Loading commit data...
ffserver-regression.sh Loading commit data...
ffserver.conf Loading commit data...
ffserver.regression.ref Loading commit data...
lavf-regression.sh Loading commit data...
lavfi-regression.sh Loading commit data...
lena.pnm Loading commit data...
md5.sh Loading commit data...
regression-funcs.sh Loading commit data...
rotozoom.c Loading commit data...
tiny_psnr.c Loading commit data...
utils.c Loading commit data...
videogen.c Loading commit data...