Michael Niedermayer 0cb233cf46 Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' ... * commit 'b2c087871dafc7d030b2d48457ddff597dfd4925': Move x86util.asm from libavcodec/ to libavutil/. Move x86inc.asm to libavutil/. APIchanges: note error_recognition in lavf lavf: add support for error_recognition, use it in avidec, and bump minor API version avconv: change semantics of -map avconv: get rid of new* options. cmdutils: allow precisely specifying a stream for AVOptions. configure: add missing CFLAGS to fix building on the HURD libx264: Include hint for possible values for configuring libx264 cmdutils: allow ':'-separated modifiers in option names. avconv: make -map_metadata work consistently with the other options avconv: remove deprecated options. avconv: make -map_chapters accept only the input file index. Make a copy of ffmpeg under a new name -- avconv. ffmpeg: add a warning stating that the program is deprecated. Add weighted motion compensation for RV40 B-frames RV3/4: calculate B-frame motion weights once per frame Move RV3/4-specific DSP functions into their own context mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt h264: notice memory allocation failure Conflicts: .gitignore Makefile cmdutils.c configure doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/libx264.c libavformat/avformat.h libavformat/avidec.c libavformat/version.h tests/lavf-regression.sh tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-08-13 02:56:08 +02:00
..
ac3dsp_mmx.c
ac3dsp.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
cabac.h
cavsdsp_mmx.c
dct32_sse.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
deinterlace.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
dnxhd_mmx.c
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
dsputil_mmx.h
dsputil_yasm.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
dsputilenc_mmx.c
dsputilenc_yasm.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
fdct_mmx.c
fft_3dn2.c
fft_3dn.c
fft_mmx.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
fft_sse.c
fft.c
fft.h
fmtconvert_mmx.c
fmtconvert.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
h264_chromamc_10bit.asm
h264_chromamc.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
h264_deblock_10bit.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
h264_deblock.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
h264_i386.h
h264_idct_10bit.asm
h264_idct.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
h264_intrapred_10bit.asm
h264_intrapred_init.c
h264_intrapred.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
h264_qpel_10bit.asm
h264_qpel_mmx.c
h264_weight_10bit.asm
h264_weight.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
h264dsp_mmx.c
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
lpc_mmx.c
Makefile	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c
mpegvideo_mmx_template.c
mpegvideo_mmx.c
png_mmx.c
rv40dsp.c
simple_idct_mmx.c
snowdsp_mmx.c
vc1dsp_mmx.c
vc1dsp_yasm.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
vp3dsp.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
vp8dsp-init.c
vp8dsp.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm	Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'	2011-08-13 02:56:08 +02:00