• 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
..
examples Loading commit data...
APIchanges Loading commit data...
TODO Loading commit data...
avutil.txt Loading commit data...
bitstream_filters.texi Loading commit data...
build_system.txt Loading commit data...
decoders.texi Loading commit data...
demuxers.texi Loading commit data...
developer.texi Loading commit data...
encoders.texi Loading commit data...
eval.texi Loading commit data...
faq.texi Loading commit data...
fate.txt Loading commit data...
ffmpeg-mt-authorship.txt Loading commit data...
ffmpeg.texi Loading commit data...
ffplay.texi Loading commit data...
ffprobe.texi Loading commit data...
ffserver.conf Loading commit data...
ffserver.texi Loading commit data...
fftools-common-opts.texi Loading commit data...
filters.texi Loading commit data...
general.texi Loading commit data...
git-howto.txt Loading commit data...
indevs.texi Loading commit data...
issue_tracker.txt Loading commit data...
libavfilter.texi Loading commit data...
metadata.texi Loading commit data...
multithreading.txt Loading commit data...
muxers.texi Loading commit data...
optimization.txt Loading commit data...
outdevs.texi Loading commit data...
protocols.texi Loading commit data...
rate_distortion.txt Loading commit data...
snow.txt Loading commit data...
soc.txt Loading commit data...
swscale.txt Loading commit data...
t2h.init Loading commit data...
tablegen.txt Loading commit data...
texi2pod.pl Loading commit data...
viterbi.txt Loading commit data...