Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Jan 2012 00:07:00 +0000 (01:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Jan 2012 00:16:54 +0000 (01:16 +0100)
commit4640da7e58509996ff03b1a0b018ca8f337391c7
tree732195f8bc4987e4974df716789044c7e3db0836
parenta91f2066651416e0f9315e7fb0132587352c75dc
parent4cd0bdae9a62d1f0366e60603222762af31e5289
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sgidec: Use bytestream2 functions to prevent buffer overreads.
  cosmetics: Move static and inline attributes to more standard places.
  configure: provide libavfilter/version.h header to get_version()
  swscale: change yuv2yuvX code to use cpuflag().
  libx264: Don't leave max_b_frames as -1 if the user didn't set it
  FATE: convert output to rgba for the targa tests which currently output pal8
  fate: add missing reference files for targa tests in 9c2f9b0e2
  FATE: enable the 2 remaining targa conformance suite tests
  targa: add support for rgb555 palette
  FATE: fix targa tests on big-endian systems

Conflicts:
libavcodec/sgidec.c
libavcodec/targa.c
libswscale/x86/output.asm
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
libavcodec/bytestream.h
libavcodec/g722.c
libavcodec/h264_loopfilter.c
libavcodec/libx264.c
libavcodec/sgidec.c
libavcodec/targa.c
libavfilter/vf_fade.c
libswscale/utils.c
libswscale/x86/output.asm
tests/fate/image.mak
tests/ref/fate/targa-conformance-CCM8
tests/ref/fate/targa-conformance-UCM8