Michael Niedermayer 5297003aa7 Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123'
* commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123':
  LucasArts SMUSH demuxer

Conflicts:
	Changelog
	doc/general.texi
	libavformat/smush.c
	libavformat/version.h

See: bef8fd7099edfac9c487e6eb75d7e6116ad80465
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 23:29:47 +02:00

17 lines
882 B
Plaintext

#tb 0: 1/15
0, 0, 0, 1, 921600, 0x00000000
0, 1, 1, 1, 921600, 0x00000000
0, 2, 2, 1, 921600, 0x00000000
0, 3, 3, 1, 921600, 0x00000000
0, 4, 4, 1, 921600, 0x00000000
0, 5, 5, 1, 921600, 0x00000000
0, 6, 6, 1, 921600, 0x00000000
0, 7, 7, 1, 921600, 0x00000000
0, 8, 8, 1, 921600, 0x00000000
0, 9, 9, 1, 921600, 0x00000000
0, 10, 10, 1, 921600, 0x0aa05443
0, 11, 11, 1, 921600, 0x81d2a7fe
0, 12, 12, 1, 921600, 0x769f303b
0, 13, 13, 1, 921600, 0xcd68d0cd
0, 14, 14, 1, 921600, 0x4cb4894a