• 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
h264_ps.c 25.3 KB