Merge commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 15:36:08 +0000 (16:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 15:40:59 +0000 (16:40 +0100)
commit0b74fd11341230721ef188d520e166b105fb111c
tree1a58104d6a3ed555757493112b677def569badc2
parent73562f1f834ef0ec8f5f881be73a135b9348c112
parentdff6197dfb9b2d145729885c63f865c5fdd184aa
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>
libavcodec/nuv.c
libavcodec/yop.c
tests/ref/fate/nuv-rtjpeg-fh
tests/ref/fate/yop