Michael Niedermayer 9dbedf331e Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'
* commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b':
  yop: simplify/sanitize the decoding loop
  c93: set palette_has_changed.
  bmp: cosmetics, reformat
  hlsenc: Don't duplicate a string constant

Conflicts:
	libavcodec/bmp.c
	tests/ref/fate/yop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-24 15:48:02 +01:00
..
2012-11-29 13:24:48 +00:00
2012-11-23 17:30:05 +00:00
amv
ast
2012-11-23 17:30:05 +00:00
2012-10-12 20:56:54 +02:00
bfi
2012-11-17 08:45:47 +01:00
2012-11-17 08:45:47 +01:00
2012-11-17 08:45:47 +01:00
2012-12-11 11:34:47 +00:00
caf
crc
dpx
2012-12-15 12:41:24 +01:00
2012-12-15 12:41:24 +01:00
2012-12-15 12:41:24 +01:00
2012-12-05 00:01:17 +01:00
jv
2012-11-07 01:51:24 +01:00
2012-10-08 09:06:25 +00:00
md5
mtv
2012-11-16 14:12:37 +01:00
2012-11-05 02:20:52 +01:00
2012-11-06 16:18:30 +00:00
ptx
rl2
sha
smc
thp
tmv
2012-10-16 18:51:16 +02:00
vp5
w64
2012-10-15 08:32:34 +02:00
2012-12-10 11:19:42 -05:00