mirror of https://git.ffmpeg.org/ffmpeg.git
bff2afb3e9
* qatar/master: x86: dsputil: Only compile motion_est code when encoders are enabled mem: fix typo in check for __ICC fate: mp3: drop redundant CMP setting rtp: Depacketization of JPEG (RFC 2435) Rename ff_put_string to avpriv_put_string mjpeg: Rename some symbols to avpriv_* instead of ff_* yadif: cosmetics Conflicts: Changelog libavcodec/mjpegenc.c libavcodec/x86/Makefile libavfilter/vf_yadif.c libavformat/version.h libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
aac.mak | ||
ac3.mak | ||
acodec.mak | ||
adpcm.mak | ||
alac.mak | ||
als.mak | ||
amrnb.mak | ||
amrwb.mak | ||
atrac.mak | ||
audio.mak | ||
bmp.mak | ||
cdxl.mak | ||
cover-art.mak | ||
dct.mak | ||
demux.mak | ||
dfa.mak | ||
dpcm.mak | ||
ea.mak | ||
fft.mak | ||
filter.mak | ||
flac.mak | ||
h264.mak | ||
image.mak | ||
indeo.mak | ||
libavcodec.mak | ||
libavutil.mak | ||
lossless-audio.mak | ||
lossless-video.mak | ||
mapchan.mak | ||
microsoft.mak | ||
mp3.mak | ||
mpc.mak | ||
options.mak | ||
pcm.mak | ||
probe.mak | ||
prores.mak | ||
qt.mak | ||
qtrle.mak | ||
real.mak | ||
screen.mak | ||
subtitles.mak | ||
utvideo.mak | ||
vcodec.mak | ||
video.mak | ||
voice.mak | ||
vorbis.mak | ||
vpx.mak | ||
vqf.mak | ||
wavpack.mak | ||
wma.mak |