• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · d552f616
    Michael Niedermayer authored
    * qatar/master: (28 commits)
      Remove some non-compiling debug messages.
      ffplay: Fix non-compiling debug printf and replace it by av_dlog.
      H264: x86 predict init cosmetics.
      ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
      Move E-AC-3 encoder functions to a separate eac3enc.c file.
      ac3enc: remove convenience macro, #define DEBUG
      ac3enc: remove unused #define
      vc1: re-initialize tables after width/height change.
      APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition
      samplefmt: add av_get_bytes_per_sample()
      iirfilter: fix biquad filter coefficients.
      swscale: remove duplicate conversion routine in swScale().
      swscale: add yuv2planar/packed function typedefs.
      swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers.
      swscale: reindent x86 init code.
      swscale: extract SWS_FULL_CHR_H_INT conditional into init code.
      swscale: cosmetics.
      swscale: remove alp/chr/lumSrcOffset.
      swscale: un-special-case yuv2yuvX16_c().
      shorten: Remove stray DEBUG #define and corresponding av_dlog statement.
      ...
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/ac3enc.c
    	libavutil/avutil.h
    	libavutil/samplefmt.c
    	libswscale/swscale.c
    	libswscale/swscale_internal.h
    	libswscale/x86/swscale_template.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d552f616
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...
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...