Michael Niedermayer 67235dfa1d 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>
2012-03-15 01:27:10 +01:00
..
asf
2012-02-07 20:11:11 +01:00
avi
2012-02-07 20:11:11 +01:00
caf
2011-12-11 09:45:17 +01:00
2012-02-02 14:16:34 +01:00
gxf
2012-02-08 21:51:24 +01:00
jpg
2010-03-15 16:37:02 +00:00
mkv
2012-02-07 20:11:11 +01:00
mov
2012-02-02 14:16:34 +01:00
mpg
2012-02-07 20:11:11 +01:00
mxf
2012-02-02 14:16:34 +01:00
nut
2012-02-07 20:11:11 +01:00
ogg
2012-02-07 20:11:11 +01:00
pam
2012-03-14 15:34:50 +01:00
rm
2012-02-07 20:11:11 +01:00
2012-03-03 20:57:03 -05:00