Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jun 2011 01:56:36 +0000 (03:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jun 2011 03:25:28 +0000 (05:25 +0200)
commitd552f616a26623e5b593e4d3474c61563f3939fd
treef5f3791b58abe6ea8895709b7d2be272afc493ab
parent7d89f7cbf3ccd98f9a5f58db97effa9afd2d571a
parentac4a8548110bc180cb67bea6eaf8b8e1081370cf
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
41 files changed:
configure
doc/APIchanges
ffplay.c
libavcodec/Makefile
libavcodec/aac_tablegen.h
libavcodec/ac3.h
libavcodec/ac3enc.c
libavcodec/ac3enc.h
libavcodec/bitstream.c
libavcodec/dnxhdenc.h
libavcodec/dv.c
libavcodec/dvbsub_parser.c
libavcodec/dvbsubdec.c
libavcodec/iirfilter.c
libavcodec/mlpdsp.c
libavcodec/pgssubdec.c
libavcodec/ppc/h264_template_altivec.c
libavcodec/shorten.c
libavcodec/v210enc.c
libavcodec/vc1dec.c
libavcodec/vorbisdec.c
libavcodec/x86/h264_intrapred_init.c
libavformat/avidec.c
libavformat/mmsh.c
libavformat/mov.c
libavformat/mpeg.c
libavformat/rtspdec.c
libavutil/audioconvert.c
libavutil/avutil.h
libavutil/eval.c
libavutil/imgutils.c
libavutil/imgutils.h
libavutil/inverse.c
libavutil/parseutils.c
libavutil/parseutils.h
libavutil/samplefmt.c
libavutil/samplefmt.h
libswscale/ppc/swscale_altivec.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/x86/swscale_template.c