Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jun 2011 01:02:38 +0000 (03:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jun 2011 01:33:58 +0000 (03:33 +0200)
commitf9569249c274ab71b570d6a462903379e9d414fb
tree0b8f8c4930874a5115f6608a23b55eb2f5be1c34
parent6700aa8810d877cb017d977f12638481df459eb1
parenteb7505e4295dca9c3ab8c01e055a458e07857ef0
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Remove some unused scripts from tools/.
  Add x86 assembly for some 10-bit H.264 intra predict functions.
  v4l2: do not force NTSC as standard
  Skip tableprint.h during 'make checkheaders'.
  Remove unnecessary LIBAVFORMAT_BUILD #ifdef.
  Drop explicit filenames from @file Doxygen tags.
  Skip generated table headers during 'make checkheaders'.
  lavf,lavc: free avoptions in a generic way.
  AVOptions: add av_opt_free convenience function.
  tableprint: Restore mistakenly deleted common.h #include for FF_ARRAY_ELEMS.
  tiff: print log in case of unknown / unsupported tag.
  tiff: fix linesize for mono-white/black formats.
  Fix build of eval-test program
  configure: Document --enable-vaapi
  ac3enc: extract all exponents for the frame at once

Merged-by: Michael Niedermayer <michaelni@gmx.at>
24 files changed:
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/ac3enc.c
libavcodec/lagarith.c
libavcodec/lagarithrac.c
libavcodec/lagarithrac.h
libavcodec/tableprint.h
libavcodec/tiff.c
libavcodec/utils.c
libavcodec/x86/Makefile
libavcodec/x86/h264_intrapred_init.c
libavdevice/bktr.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavformat/rawdec.c
libavformat/tty.c
libavformat/utils.c
libavutil/internal.h
libavutil/opt.c
libavutil/opt.h