Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Mar 2012 00:21:16 +0000 (01:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Mar 2012 00:27:10 +0000 (01:27 +0100)
commit67235dfa1d2b4bab2c8015e5b8e43ea63a681892
tree6de0622de5bbdf40c5770899bcfb989b31bcd2a4
parent9e2ee46206a5a4db91ee4d26737b515797e6b08e
parente0febda22d0e0fab094a9c886b0e0f0f662df1ef
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: stricter reference limit enforcement.
  h264: increase reference poc list from 16 to 32.
  xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
  snow: check reference frame indices.
  snow: reject unsupported chroma shifts.
  Add ffvhuff encoding and decoding regression test
  anm: convert to bytestream2 API
  bytestream: add more unchecked variants for bytestream2 API
  jvdec: unbreak video decoding
  jv demux: set video stream duration
  fate: add pam image regression test

Conflicts:
libavcodec/adpcm.c
libavcodec/anm.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/snowdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/adpcm.c
libavcodec/anm.c
libavcodec/bytestream.h
libavcodec/h264.c
libavcodec/jvdec.c
libavcodec/snowdec.c
libavformat/jvdec.c
tests/codec-regression.sh
tests/lavf-regression.sh
tests/ref/vsynth1/ffvhuff
tests/ref/vsynth2/ffvhuff