• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2fd49019
    Michael Niedermayer authored
    * qatar/master:
      libx264: add 'cplxblur' private option
      libx264: add 'deblock' private option
      libx264: add 'b-bias' private option
      libx264: fix setting some options.
      libx264: remove useless assignment
      ac3dec: avoid pointless alloc and indirection for input_buffer
      mpeg12: cosmetics: reformat as K&R
    
    Conflicts:
    	libavcodec/libx264.c
    	libavcodec/mpeg12.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2fd49019
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...
avconv.c 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...
subdir.mak Loading commit data...
version.sh Loading commit data...