mirror of https://git.ffmpeg.org/ffmpeg.git
* 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> |
||
---|---|---|
.. | ||
APIchanges | ||
TODO | ||
avutil.txt | ||
bitstream_filters.texi | ||
build_system.txt | ||
decoders.texi | ||
demuxers.texi | ||
developer.texi | ||
encoders.texi | ||
eval.texi | ||
faq.texi | ||
fate.txt | ||
ffmpeg-mt-authorship.txt | ||
ffmpeg.texi | ||
ffplay.texi | ||
ffprobe.texi | ||
ffserver.conf | ||
ffserver.texi | ||
fftools-common-opts.texi | ||
filters.texi | ||
general.texi | ||
git-howto.txt | ||
indevs.texi | ||
issue_tracker.txt | ||
libavfilter.texi | ||
metadata.texi | ||
multithreading.txt | ||
muxers.texi | ||
optimization.txt | ||
outdevs.texi | ||
protocols.texi | ||
rate_distortion.txt | ||
snow.txt | ||
soc.txt | ||
swscale.txt | ||
t2h.init | ||
tablegen.txt | ||
texi2pod.pl | ||
viterbi.txt |