mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-18 03:19:31 +02:00
b8a43bc1b5
* qatar/master: (27 commits) ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. ac3dsp: fix loop condition in ac3_update_bap_counts_c() ARM: unbreak build ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4. ac3enc: split mantissa bit counting into a separate function. ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct. get_bits: add av_unused tag to cache variable sws: replace all long with int. ARM: aacdec: fix constraints on inline asm ARM: remove unnecessary volatile from inline asm ARM: add "cc" clobbers to inline asm where needed ARM: improve FASTDIV asm ac3enc: use LOCAL_ALIGNED macro APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). lavu: add av_get_pix_fmt_name() convenience function cmdutils: remove OPT_FUNC2 swscale: fix crash in bilinear scaling. vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping webm: support stereo videos in matroska/webm muxer ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges doc/muxers.texi ffmpeg.c ffplay.c libavcodec/ac3enc.c libavcodec/ac3enc_float.c libavcodec/avcodec.h libavcodec/get_bits.h libavcodec/libvpxenc.c libavcodec/version.h libavdevice/libdc1394.c libavformat/matroskaenc.c libavutil/avutil.h libswscale/rgb2rgb.c libswscale/swscale.c libswscale/swscale_template.c libswscale/x86/swscale_template.c 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.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 | ||