• Michael Niedermayer's avatar
    Merge commit 'ec36aa69' · 98298eb1
    Michael Niedermayer authored
    * commit 'ec36aa69':
      x86: Fix linking with some or all of yasm, mmx, optimizations disabled
      configure: Add more fine-grained SSE CPU capabilities flags
      avfilter: x86: Use more precise compile template names
      x86: cosmetics: Comment some #endifs for better readability
      g723_1: add comfort noise generation
      utvideoenc: Switch to dsputils' median prediction
      utvideoenc: Avoid writing into the input picture
      avtools: remove the distinction between func_arg and func2_arg.
      avconv: make the -passlogfile option per-stream.
      avconv: make the -pass option per-stream.
      cmdutils: make -codecs print lossy/lossless flags.
      lavc: add lossy/lossless codec properties.
    
    Conflicts:
    	Changelog
    	cmdutils.c
    	configure
    	doc/APIchanges
    	ffmpeg.h
    	ffmpeg_opt.c
    	ffprobe.c
    	libavcodec/codec_desc.c
    	libavcodec/g723_1.c
    	libavcodec/utvideoenc.c
    	libavcodec/version.h
    	libavcodec/x86/mpegaudiodec.c
    	libavcodec/x86/rv40dsp_init.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    98298eb1
fmtconvert_init.c 5.87 KB