Michael Niedermayer 01fcbdf9ce Merge remote-tracking branch 'qatar/master'
* qatar/master:
  smacker: Sanity check huffman tables found in the headers.
  smacker: remove dead store
  qdm2: Check data block size for bytes to bits overflow.
  mxfdec: Fix files with essence containers larger than 2 GiB.
  mxfdec: Employ correct printf conversion specifiers for POSIX int types.
  vc1: always read the bfraction element for interlaced fields
  fate: add XWD image regression test
  lavf: prevent infinite loops while flushing in avformat_find_stream_info
  matroskadec: Pad AAC extradata.
  ismindex: Fix build on mingw

Conflicts:
	libavformat/mxfdec.c
	libavformat/utils.c
	tests/lavf-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-27 02:09:58 +01:00
..
asf
2011-12-12 20:51:29 +01:00
avi
2011-12-12 20:51:29 +01:00
caf
2011-12-11 09:45:17 +01:00
gxf
2011-12-07 15:29:26 +01:00
jpg
2010-03-15 16:37:02 +00:00
mkv
2011-12-12 20:51:29 +01:00
nut
2011-12-12 20:51:29 +01:00
ogg
2011-12-12 20:51:29 +01:00
rm
2011-12-12 20:51:29 +01:00
ts
2011-12-12 20:51:29 +01:00
wtv
2011-12-12 20:51:29 +01:00