[FFmpeg-cvslog] Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

[Geek.Song]

Dear:

This merge breaks AVX detection

My CPU is Core2 duo, but I get "#define HAVE_AVX 1" in config.h

the libav's implementation use "HAVE_AVX_EXTERNAL" to determine AVX,
"HAVE_AVX_EXTERNAL" is defined to zero in config.h. so it should be
OK.


On Fri, Aug 31, 2012 at 7:08 PM, Michael Niedermayer <git at videolan.org> wrote:
> ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 31 12:04:17 2012 +0200| [98298eb1034bddb4557fa689553dae793c2b0092] | committer: Michael Niedermayer
>
> 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 at gmx.at>

-- 
-----------------------------------------------------------------------------------------
My key fingerprint: d1:03:f5:32:26:ff:d7:3c:e4:42:e3:51:ec:92:78:b2