• 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
flac.h 4.97 KB