1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-09 14:07:31 +02:00
Michael Niedermayer 0b74fd1134 Merge commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa'
* commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa':
  nuv: do not rely on get_buffer() initializing the frame.
  yop: initialize palette to 0

Conflicts:
	libavcodec/nuv.c
	tests/ref/fate/nuv-rtjpeg-fh
	tests/ref/fate/yop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 16:40:59 +01:00
..
2013-02-06 10:21:52 +01:00
2012-11-29 13:24:48 +00:00
2012-11-23 17:30:05 +00:00
amv
2012-09-02 18:15:08 +02:00
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
2012-08-25 16:46:50 -04:00
crc
2013-01-11 23:44:04 +01:00
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
2013-01-15 23:18:07 +02:00
2013-01-09 14:49:07 -05:00
jv
2012-11-07 01:51:24 +01:00
2012-10-08 09:06:25 +00:00
md5
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
2012-12-30 23:37:14 +01:00
2012-12-31 00:41:35 +01:00
2012-12-30 23:09:49 +01:00
2012-12-30 23:55:28 +01:00
2013-01-03 07:25:47 +01:00
thp
tmv
2012-10-16 18:51:16 +02:00
vp5
w64
2012-10-15 08:32:34 +02:00
2013-02-06 10:21:52 +01:00
2012-12-10 11:19:42 -05:00