Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Aug 2012 10:04:17 +0000 (12:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Aug 2012 11:01:30 +0000 (13:01 +0200)
commit98298eb1034bddb4557fa689553dae793c2b0092
treed35dcd981b6647c9f538bc9b346ab806864bc359
parentf3683349aecf3be4c9c875186a812c0cde8ecf41
parentec36aa69448f20a78d8c4588265022e0b2272ab5
Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

* commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5':
  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: Michael Niedermayer <michaelni@gmx.at>
29 files changed:
Changelog
cmdutils.c
cmdutils.h
configure
doc/APIchanges
doc/ffmpeg.texi
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
ffplay.c
ffprobe.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/g723_1.c
libavcodec/g723_1_data.h
libavcodec/utvideoenc.c
libavcodec/version.h
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/fmtconvert_init.c
libavcodec/x86/mpegaudiodec.c
libavcodec/x86/mpegvideoenc.c
libavcodec/x86/rv40dsp_init.c
libavcodec/x86/vc1dsp_mmx.c
libavcodec/x86/vp8dsp_init.c
libavfilter/x86/yadif.c
libavfilter/x86/yadif_template.c
libavutil/x86/cpu.c
libswscale/x86/swscale.c
tests/fate/voice.mak