mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-01 12:22:09 +00:00
11a1033c9f
* qatar/master: (23 commits) build: cosmetics: Reorder some lists in a more logical fashion x86: pngdsp: Fix assembly for OS/2 fate: add test for RTjpeg in nuv with frameheader rtmp: send check_bw as notification g723_1: clip argument for 15-bit version of normalize_bits() g723_1: use all LPC vectors in formant postfilter id3v2: Support v2.2 PIC avplay: fix build with lavfi disabled. avconv: split configuring filter configuration to a separate file. avconv: split option parsing into a separate file. mpc8: do not leave padding after last frame in buffer for the next decode call mpegaudioenc: list supported channel layouts. mpegaudiodec: don't print an error on > 1 frame in a packet. api-example: update to new audio encoding API. configure: add --enable/disable-random option doc: cygwin: Update list of FATE package requirements build: Remove all installed headers and header directories on uninstall build: change checkheaders to use regular build rules rtmp: Add a new option 'rtmp_subscribe' rtmp: Add support for subscribing live streams ... Conflicts: Makefile common.mak configure doc/examples/decoding_encoding.c ffmpeg.c libavcodec/g723_1.c libavcodec/mpegaudiodec.c libavcodec/x86/pngdsp.asm libavformat/version.h library.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
aac.mak | ||
ac3.mak | ||
acodec.mak | ||
adpcm.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 |