mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-13 21:28:01 +02:00
31ab1575e5
* qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| ac3dsp_init.c | ||
| ac3dsp.asm | ||
| cabac.h | ||
| cavsdsp.c | ||
| dct32.asm | ||
| deinterlace.asm | ||
| diracdsp_mmx.c | ||
| diracdsp_mmx.h | ||
| diracdsp_yasm.asm | ||
| dnxhdenc.c | ||
| dsputil_avg_template.c | ||
| dsputil_mmx.c | ||
| dsputil_mmx.h | ||
| dsputil_qns_template.c | ||
| dsputil_rnd_template.c | ||
| dsputil.asm | ||
| dsputilenc_mmx.c | ||
| dsputilenc.asm | ||
| dwt_yasm.asm | ||
| dwt.c | ||
| dwt.h | ||
| fdct.c | ||
| fft_init.c | ||
| fft.asm | ||
| fft.h | ||
| fmtconvert_init.c | ||
| fmtconvert.asm | ||
| h264_chromamc_10bit.asm | ||
| h264_chromamc.asm | ||
| h264_deblock_10bit.asm | ||
| h264_deblock.asm | ||
| h264_i386.h | ||
| h264_idct_10bit.asm | ||
| h264_idct.asm | ||
| h264_intrapred_10bit.asm | ||
| h264_intrapred_init.c | ||
| h264_intrapred.asm | ||
| h264_qpel_10bit.asm | ||
| h264_qpel.c | ||
| h264_weight_10bit.asm | ||
| h264_weight.asm | ||
| h264dsp_init.c | ||
| idct_mmx_xvid.c | ||
| idct_mmx.c | ||
| idct_sse2_xvid.c | ||
| idct_xvid.h | ||
| imdct36.asm | ||
| lpc.c | ||
| Makefile | ||
| mathops.h | ||
| mlpdsp.c | ||
| motion_est.c | ||
| mpegaudiodec.c | ||
| mpegvideo.c | ||
| mpegvideoenc_template.c | ||
| mpegvideoenc.c | ||
| pngdsp_init.c | ||
| pngdsp.asm | ||
| proresdsp_init.c | ||
| proresdsp.asm | ||
| rv34dsp_init.c | ||
| rv34dsp.asm | ||
| rv40dsp_init.c | ||
| rv40dsp.asm | ||
| sbrdsp_init.c | ||
| sbrdsp.asm | ||
| simple_idct.c | ||
| snowdsp.c | ||
| v210-init.c | ||
| v210.asm | ||
| vc1dsp_mmx.c | ||
| vc1dsp.asm | ||
| vp3dsp_init.c | ||
| vp3dsp.asm | ||
| vp8dsp_init.c | ||
| vp8dsp.asm | ||
| vp56_arith.h | ||
| vp56dsp_init.c | ||
| vp56dsp.asm | ||
| w64xmmtest.c | ||