mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
d552f616a2
* qatar/master: (28 commits) Remove some non-compiling debug messages. ffplay: Fix non-compiling debug printf and replace it by av_dlog. H264: x86 predict init cosmetics. ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder. Move E-AC-3 encoder functions to a separate eac3enc.c file. ac3enc: remove convenience macro, #define DEBUG ac3enc: remove unused #define vc1: re-initialize tables after width/height change. APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition samplefmt: add av_get_bytes_per_sample() iirfilter: fix biquad filter coefficients. swscale: remove duplicate conversion routine in swScale(). swscale: add yuv2planar/packed function typedefs. swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers. swscale: reindent x86 init code. swscale: extract SWS_FULL_CHR_H_INT conditional into init code. swscale: cosmetics. swscale: remove alp/chr/lumSrcOffset. swscale: un-special-case yuv2yuvX16_c(). shorten: Remove stray DEBUG #define and corresponding av_dlog statement. ... Conflicts: doc/APIchanges libavcodec/ac3enc.c libavutil/avutil.h libavutil/samplefmt.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
examples | ||
APIchanges | ||
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 | ||
TODO | ||
viterbi.txt |