mirror of https://git.ffmpeg.org/ffmpeg.git
0b9a69f244
* qatar/master: (22 commits) aacdec: Fix PS in ADTS. avconv: Consistently use PIX_FMT_NONE. dsputil: use cpuflags in x86 emu_edge_core dsputil: use movups instead of movdqu in ff_emu_edge_core_sse() wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits. mov: Remove some redundant and obsolete comments. Add libavutil/mathematics.h #includes for INFINITY doxy: structure libavformat groups doxy: introduce an empty structure in libavcodec doxy: provide a start page and document libavutil doxy: cleanup pixfmt.h regtest: split video encode/decode tests into individual targets ARM: add explicit .arch and .fpu directives to asm.S pthread: do not touch has_b_frames avconv: cleanup the transcoding loop in output_packet(). avconv: split subtitle transcoding out of output_packet(). avconv: split video transcoding out of output_packet(). avconv: split audio transcoding out of output_packet(). avconv: reindent. avconv: move streamcopy-only code out of decoding loop. ... Conflicts: avconv.c libavcodec/aaccoder.c libavcodec/pthread.c libavcodec/version.h libavutil/audioconvert.h libavutil/avutil.h libavutil/mem.h tests/ref/vsynth1/dv tests/ref/vsynth1/mpeg2thread tests/ref/vsynth2/dv tests/ref/vsynth2/mpeg2thread Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| ac3dsp.asm | ||
| ac3dsp_mmx.c | ||
| cabac.h | ||
| cavsdsp_mmx.c | ||
| dct32_sse.asm | ||
| deinterlace.asm | ||
| diracdsp_mmx.c | ||
| diracdsp_mmx.h | ||
| diracdsp_yasm.asm | ||
| dnxhd_mmx.c | ||
| dsputil_mmx.c | ||
| dsputil_mmx.h | ||
| dsputil_mmx_avg_template.c | ||
| dsputil_mmx_qns_template.c | ||
| dsputil_mmx_rnd_template.c | ||
| dsputil_yasm.asm | ||
| dsputilenc_mmx.c | ||
| dsputilenc_yasm.asm | ||
| dwt.c | ||
| dwt.h | ||
| dwt_yasm.asm | ||
| fdct_mmx.c | ||
| fft.c | ||
| fft.h | ||
| fft_3dn.c | ||
| fft_3dn2.c | ||
| fft_mmx.asm | ||
| fft_sse.c | ||
| fmtconvert.asm | ||
| fmtconvert_mmx.c | ||
| h264_chromamc.asm | ||
| h264_chromamc_10bit.asm | ||
| h264_deblock.asm | ||
| h264_deblock_10bit.asm | ||
| h264_i386.h | ||
| h264_idct.asm | ||
| h264_idct_10bit.asm | ||
| h264_intrapred.asm | ||
| h264_intrapred_10bit.asm | ||
| h264_intrapred_init.c | ||
| h264_qpel_10bit.asm | ||
| h264_qpel_mmx.c | ||
| h264_weight.asm | ||
| h264_weight_10bit.asm | ||
| h264dsp_mmx.c | ||
| idct_mmx.c | ||
| idct_mmx_xvid.c | ||
| idct_sse2_xvid.c | ||
| idct_xvid.h | ||
| imdct36_sse.asm | ||
| lpc_mmx.c | ||
| mathops.h | ||
| mlpdsp.c | ||
| motion_est_mmx.c | ||
| mpegaudiodec_mmx.c | ||
| mpegvideo_mmx.c | ||
| mpegvideo_mmx_template.c | ||
| png_mmx.c | ||
| proresdsp-init.c | ||
| proresdsp.asm | ||
| rv40dsp.c | ||
| 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.asm | ||
| vp56dsp_init.c | ||