diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 16:36:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 16:40:59 +0100 |
| commit | 0b74fd11341230721ef188d520e166b105fb111c (patch) | |
| tree | 1a58104d6a3ed555757493112b677def569badc2 /libavcodec/sipr.h | |
| parent | 73562f1f834ef0ec8f5f881be73a135b9348c112 (diff) | |
| parent | dff6197dfb9b2d145729885c63f865c5fdd184aa (diff) | |
| download | ffmpeg-0b74fd11341230721ef188d520e166b105fb111c.tar.gz | |
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>
Diffstat (limited to 'libavcodec/sipr.h')
0 files changed, 0 insertions, 0 deletions