mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 00:32:31 +00:00
edae3dbf1d
* qatar/master: (23 commits) h264: hide reference frame errors unless requested swscale: split hScale() function pointer into h[cy]Scale(). Move clipd macros to x86util.asm. avconv: reindent. avconv: rescue poor abused start_time global. avconv: rescue poor abused recording_time global. avconv: merge two loops in output_packet(). avconv: fix broken indentation. avconv: get rid of the arbitrary MAX_FILES limit. avconv: get rid of the output_streams_for_file vs. ost_table schizophrenia avconv: add a wrapper for output AVFormatContexts and merge output_opts into it avconv: make itsscale syntax consistent with other options. avconv: factor out adding input streams. avconv: Factorize combining auto vsync with format. avconv: Factorize video resampling. avconv: Don't unnecessarily convert ipts to a double. ffmpeg: remove unsed variable nopts RV3/4 parser: remove unused variable 'off' add XMV demuxer rmdec: parse FPS in RealMedia properly ... Conflicts: avconv.c libavformat/version.h libswscale/swscale.c tests/ref/fate/lmlm4-demux Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| ac3dsp_mmx.c | ||
| ac3dsp.asm | ||
| cabac.h | ||
| 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_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 | ||
| 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 | ||
| rv40dsp.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 | ||