mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-06 23:31:13 +00: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> |
||
|---|---|---|
| .. | ||
| arm | ||
| avr32 | ||
| bfin | ||
| mips | ||
| ppc | ||
| sh4 | ||
| tomi | ||
| x86 | ||
| adler32.c | ||
| adler32.h | ||
| aes.c | ||
| aes.h | ||
| attributes.h | ||
| audioconvert.c | ||
| audioconvert.h | ||
| avassert.h | ||
| avstring.c | ||
| avstring.h | ||
| avutil.h | ||
| base64.c | ||
| base64.h | ||
| bswap.h | ||
| colorspace.h | ||
| common.h | ||
| cpu.c | ||
| cpu.h | ||
| crc_data.h | ||
| crc.c | ||
| crc.h | ||
| des.c | ||
| des.h | ||
| error.c | ||
| error.h | ||
| eval.c | ||
| eval.h | ||
| fifo.c | ||
| fifo.h | ||
| file.c | ||
| file.h | ||
| imgutils.c | ||
| imgutils.h | ||
| integer.c | ||
| integer.h | ||
| internal.h | ||
| intfloat_readwrite.c | ||
| intfloat_readwrite.h | ||
| intmath.h | ||
| intreadwrite.h | ||
| inverse.c | ||
| lfg.c | ||
| lfg.h | ||
| libavutil.v | ||
| libm.h | ||
| lls.c | ||
| lls.h | ||
| log.c | ||
| log.h | ||
| lzo.c | ||
| lzo.h | ||
| Makefile | ||
| mathematics.c | ||
| mathematics.h | ||
| md5.c | ||
| md5.h | ||
| mem.c | ||
| mem.h | ||
| opt.c | ||
| opt.h | ||
| parseutils.c | ||
| parseutils.h | ||
| pca.c | ||
| pca.h | ||
| pixdesc.c | ||
| pixdesc.h | ||
| pixfmt.h | ||
| random_seed.c | ||
| random_seed.h | ||
| rational.c | ||
| rational.h | ||
| rc4.c | ||
| rc4.h | ||
| samplefmt.c | ||
| samplefmt.h | ||
| sha.c | ||
| sha.h | ||
| softfloat.c | ||
| softfloat.h | ||
| timer.h | ||
| tree.c | ||
| tree.h | ||
| utils.c | ||
| x86_cpu.h | ||