• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b5da7d4c
    Michael Niedermayer authored
    * qatar/master:
      avformat: Drop pointless "format" from container long names
      swscale: bury one more piece of inline asm under HAVE_INLINE_ASM.
      wv: K&R formatting cosmetics
      configure: Add missing descriptions to help output
      h264_ps: declare array of colorspace strings on its own line.
      fate: amix: specify f32 sample format for comparison
      tiny_psnr: support 32-bit float samples
      eamad/eatgq/eatqi: call special EA IDCT directly
      eamad: remove use of MpegEncContext
      mpegvideo: remove unnecessary inclusions of faandct.h
      af_asyncts: avoid overflow in out_size with large delta values
      af_asyncts: add first_pts option
    
    Conflicts:
    	configure
    	libavcodec/eamad.c
    	libavcodec/h264_ps.c
    	libavformat/crcenc.c
    	libavformat/ffmdec.c
    	libavformat/ffmenc.c
    	libavformat/framecrcenc.c
    	libavformat/md5enc.c
    	libavformat/nutdec.c
    	libavformat/rawenc.c
    	libavformat/yuv4mpeg.c
    	tests/tiny_psnr.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b5da7d4c
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...