• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 039e9fe0
    Michael Niedermayer authored
    * qatar/master: (29 commits)
      lavfi: reclassify showfiltfmts as a TESTPROG
      graph2dot: fix printf format specifier
      swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32.
      vp8: loopfilter >=sse2 functions need aligned stack on x86-32.
      amr: remove shift out of the AMR_BIT() macro.
      dsputilenc: group yasm and inline asm function pointer assignment.
      mov: use forward declaration of a function instead of a table.
      Clarify Doxygen comment for FF_API_* #defines.
      configure: simplify get_version()
      Create version.h headers for libraries that lack them
      gitignore: Use full path instead of relative path to specify patterns
      mpegvideo: remove VLAs
      Add XTEA encryption support in libavutil
      Add Blowfish encryption support in libavutil
      eval: Add the isinf() function and tests for it
      flacdec: move lpc filter to flacdsp
      flacdec: split off channel decorrelation as flacdsp
      avplay: Add an option for not limiting the input buffer size
      FATE: add a test for WMA cover art.
      FATE: add a test for apetag cover art
      ...
    
    Conflicts:
    	.gitignore
    	configure
    	ffplay.c
    	libavcodec/Makefile
    	libavcodec/error_resilience.c
    	libavcodec/mpegvideo.c
    	libavcodec/ratecontrol.c
    	libavdevice/avdevice.h
    	libavfilter/Makefile
    	libavfilter/filtfmts.c
    	libavfilter/version.h
    	libavformat/mov.c
    	libavformat/version.h
    	libavutil/Makefile
    	libavutil/avutil.h
    	libavutil/version.h
    	libswscale/swscale.h
    	libswscale/x86/swscale_mmx.c
    	tests/fate/libavutil.mak
    	tests/lavfi-regression.sh
    	tools/graph2dot.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    039e9fe0
Name
Last commit
Last update
..
aac.mak Loading commit data...
ac3.mak Loading commit data...
acodec.mak Loading commit data...
adpcm.mak Loading commit data...
als.mak Loading commit data...
amrnb.mak Loading commit data...
amrwb.mak Loading commit data...
atrac.mak Loading commit data...
audio.mak Loading commit data...
bmp.mak Loading commit data...
cdxl.mak Loading commit data...
cover-art.mak Loading commit data...
dct.mak Loading commit data...
demux.mak Loading commit data...
dfa.mak Loading commit data...
dpcm.mak Loading commit data...
ea.mak Loading commit data...
fft.mak Loading commit data...
flac.mak Loading commit data...
h264.mak Loading commit data...
image.mak Loading commit data...
indeo.mak Loading commit data...
libavcodec.mak Loading commit data...
libavutil.mak Loading commit data...
lossless-audio.mak Loading commit data...
lossless-video.mak Loading commit data...
mapchan.mak Loading commit data...
microsoft.mak Loading commit data...
mp3.mak Loading commit data...
mpc.mak Loading commit data...
options.mak Loading commit data...
pcm.mak Loading commit data...
probe.mak Loading commit data...
prores.mak Loading commit data...
qt.mak Loading commit data...
qtrle.mak Loading commit data...
real.mak Loading commit data...
screen.mak Loading commit data...
subtitles.mak Loading commit data...
utvideo.mak Loading commit data...
vcodec.mak Loading commit data...
video.mak Loading commit data...
voice.mak Loading commit data...
vorbis.mak Loading commit data...
vpx.mak Loading commit data...
vqf.mak Loading commit data...
wavpack.mak Loading commit data...
wma.mak Loading commit data...