mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
99eb31e263
* qatar/master: (25 commits) Replace custom DEBUG preprocessor trickery by the standard one. vorbis: Remove non-compiling debug statement. vorbis: Remove pointless DEBUG #ifdef around debug output macros. cook: Remove non-compiling debug output. Remove pointless #ifdefs around function declarations in a header. Replace #ifdef + av_log() combinations by av_dlog(). Replace custom debug output functions by av_dlog(). cook: Remove unused debug functions. Remove stray extra arguments from av_dlog() invocations. targa: fix big-endian build v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. vfwcap: add a framerate private option. v4l2: add a framerate private option. libdc1394: add a framerate private option. fbdev: add a framerate private option. bktr: add a framerate private option. oma: check avio_read() return value nutdec: remove unused variable Remove unused variables swscale: allocate larger buffer to handle altivec overreads. ... Conflicts: ffmpeg.c libavcodec/dca.c libavcodec/dirac.c libavcodec/error_resilience.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pthread.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/shorten.c libavcodec/truemotion2.c libavcodec/utils.c libavdevice/dv1394.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/4xm.c libavformat/apetag.c libavformat/asfdec.c libavformat/avidec.c libavformat/mmf.c libavformat/mpeg.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/oggdec.c libavformat/oggparseogm.c libavformat/rl2.c libavformat/rmdec.c libavformat/rpl.c libavformat/rtpdec_latm.c libavformat/sauce.c libavformat/sol.c libswscale/utils.c tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
ac3dsp_mmx.c | ||
ac3dsp.asm | ||
cavsdsp_mmx.c | ||
dct32_sse.asm | ||
deinterlace.asm | ||
dnxhd_mmx.c | ||
dsputil_mmx_avg_template.c | ||
dsputil_mmx_qns_template.c | ||
dsputil_mmx_rnd_template.c | ||
dsputil_mmx.c | ||
dsputil_mmx.h | ||
dsputil_yasm.asm | ||
dsputilenc_mmx.c | ||
dsputilenc_yasm.asm | ||
fdct_mmx.c | ||
fft_3dn2.c | ||
fft_3dn.c | ||
fft_mmx.asm | ||
fft_sse.c | ||
fft.c | ||
fft.h | ||
fmtconvert_mmx.c | ||
fmtconvert.asm | ||
h264_chromamc.asm | ||
h264_deblock_10bit.asm | ||
h264_deblock.asm | ||
h264_i386.h | ||
h264_idct_10bit.asm | ||
h264_idct.asm | ||
h264_intrapred_init.c | ||
h264_intrapred.asm | ||
h264_qpel_mmx.c | ||
h264_weight.asm | ||
h264dsp_mmx.c | ||
idct_mmx_xvid.c | ||
idct_mmx.c | ||
idct_sse2_xvid.c | ||
idct_xvid.h | ||
lpc_mmx.c | ||
Makefile | ||
mathops.h | ||
mlpdsp.c | ||
motion_est_mmx.c | ||
mpegaudiodec_mmx.c | ||
mpegvideo_mmx_template.c | ||
mpegvideo_mmx.c | ||
png_mmx.c | ||
simple_idct_mmx.c | ||
snowdsp_mmx.c | ||
vc1dsp_mmx.c | ||
vc1dsp_yasm.asm | ||
vp3dsp.asm | ||
vp8dsp-init.c | ||
vp8dsp.asm | ||
vp56_arith.h | ||
vp56dsp_init.c | ||
vp56dsp.asm | ||
x86inc.asm | ||
x86util.asm |