Merge commit 'ec36aa69'
* 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:Michael Niedermayer <michaelni@gmx.at>
Showing
- Changelog 1 addition, 0 deletionsChangelog
- cmdutils.c 33 additions, 30 deletionscmdutils.c
- cmdutils.h 22 additions, 22 deletionscmdutils.h
- configure 29 additions, 12 deletionsconfigure
- doc/APIchanges 4 additions, 0 deletionsdoc/APIchanges
- doc/ffmpeg.texi 2 additions, 2 deletionsdoc/ffmpeg.texi
- ffmpeg.c 4 additions, 2 deletionsffmpeg.c
- ffmpeg.h 5 additions, 1 deletionffmpeg.h
- ffmpeg_opt.c 85 additions, 99 deletionsffmpeg_opt.c
- ffplay.c 4 additions, 4 deletionsffplay.c
- ffprobe.c 10 additions, 4 deletionsffprobe.c
- libavcodec/avcodec.h 10 additions, 0 deletionslibavcodec/avcodec.h
- libavcodec/codec_desc.c 298 additions, 65 deletionslibavcodec/codec_desc.c
- libavcodec/g723_1.c 220 additions, 7 deletionslibavcodec/g723_1.c
- libavcodec/g723_1_data.h 6 additions, 0 deletionslibavcodec/g723_1_data.h
- libavcodec/utvideoenc.c 7 additions, 7 deletionslibavcodec/utvideoenc.c
- libavcodec/version.h 1 addition, 1 deletionlibavcodec/version.h
- libavcodec/x86/dsputil_mmx.c 5 additions, 5 deletionslibavcodec/x86/dsputil_mmx.c
- libavcodec/x86/fmtconvert_init.c 2 additions, 2 deletionslibavcodec/x86/fmtconvert_init.c
- libavcodec/x86/mpegaudiodec.c 2 additions, 2 deletionslibavcodec/x86/mpegaudiodec.c
Loading
Please register or sign in to comment