• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · f211d9d8
    Michael Niedermayer authored
    * qatar/master:
      build: improve rules for test programs
      build: factor out the .c and .S compile commands as a macro
      swscale: remove unused xInc/srcW arguments from hScale().
      H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
      H.264: make filter_mb_fast support 4:4:4
      mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().
      configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag.
      Move some variable declarations below the proper #ifdefs.
    
    Conflicts:
    	Makefile
    	ffplay.c
    	libswscale/swscale.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f211d9d8
Name
Last commit
Last update
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
ffserver.h Loading commit data...
subdir.mak Loading commit data...
version.sh Loading commit data...