mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
18d0a16fc9
* qatar/master: swscale: make yuv2yuv1 use named registers. h264: mark h264_idct_add8_10 with number of XMM registers. swscale: fix V plane memory location in bilinear/unscaled RGB/YUYV case. vp8: always update next_framep[] before returning from decode_frame(). avconv: estimate next_dts from framerate if it is set. avconv: better next_dts usage. avconv: rename InputStream.pts to last_dts. avconv: reduce overloading for InputStream.pts. avconv: rename InputStream.next_pts to next_dts. avconv: rework -t handling for encoding. avconv: set encoder timebase for subtitles. pva-demux test: add -vn swscale: K&R formatting cosmetics for SPARC code apedec: allow the user to set the maximum number of output samples per call apedec: do not unnecessarily zero output samples for mono frames apedec: allocate a single flat buffer for decoded samples apedec: use sizeof(field) instead of sizeof(type) swscale: split C output functions into separate file. swscale: Split C input functions into separate file. bytestream: Add bytestream2 writing API. The avconv changes are due to massive regressions and bugs not merged yet. Conflicts: ffmpeg.c libavcodec/vp8.c libswscale/swscale.c libswscale/x86/swscale_template.c tests/fate/demux.mak tests/ref/lavf/asf tests/ref/lavf/avi tests/ref/lavf/mkv tests/ref/lavf/mpg tests/ref/lavf/nut tests/ref/lavf/ogg tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/seek/lavf_avi tests/ref/seek/lavf_mkv tests/ref/seek/lavf_rm Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| ac3dsp_mmx.c | ||
| ac3dsp.asm | ||
| cabac.h | ||
| cavsdsp_mmx.c | ||
| dct32_sse.asm | ||
| deinterlace.asm | ||
| diracdsp_mmx.c | ||
| diracdsp_mmx.h | ||
| diracdsp_yasm.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 | ||
| dwt_yasm.asm | ||
| dwt.c | ||
| dwt.h | ||
| 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_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_mmx.c | ||
| h264_weight_10bit.asm | ||
| h264_weight.asm | ||
| h264dsp_mmx.c | ||
| idct_mmx_xvid.c | ||
| idct_mmx.c | ||
| idct_sse2_xvid.c | ||
| idct_xvid.h | ||
| imdct36_sse.asm | ||
| lpc_mmx.c | ||
| Makefile | ||
| mathops.h | ||
| mlpdsp.c | ||
| motion_est_mmx.c | ||
| mpegaudiodec_mmx.c | ||
| mpegvideo_mmx_template.c | ||
| mpegvideo_mmx.c | ||
| pngdsp-init.c | ||
| pngdsp.asm | ||
| proresdsp-init.c | ||
| proresdsp.asm | ||
| rv34dsp_init.c | ||
| rv34dsp.asm | ||
| rv40dsp_init.c | ||
| rv40dsp.asm | ||
| simple_idct_mmx.c | ||
| snowdsp_mmx.c | ||
| v210-init.c | ||
| v210.asm | ||
| vc1dsp_mmx.c | ||
| vc1dsp_yasm.asm | ||
| vp3dsp.asm | ||
| vp8dsp-init.c | ||
| vp8dsp.asm | ||
| vp56_arith.h | ||
| vp56dsp_init.c | ||
| vp56dsp.asm | ||
| w64xmmtest.c | ||