diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 14:53:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 14:53:49 +0100 |
| commit | 6e9f3f3b6522a8c1440bab66c8a2d85791fd12f7 (patch) | |
| tree | 502e9b517e24b857069884bda22575eaf9c2779c /libavcodec/cdgraphics.c | |
| parent | fadf845973aeb47d1b0bf3eac552394fd8a71437 (diff) | |
| parent | 238614de679a71970c20d7c3fee08a322967ec40 (diff) | |
| download | ffmpeg-6e9f3f3b6522a8c1440bab66c8a2d85791fd12f7.tar.gz | |
Merge commit '238614de679a71970c20d7c3fee08a322967ec40'
* commit '238614de679a71970c20d7c3fee08a322967ec40':
cdgraphics: do not rely on get_buffer() initializing the frame.
svq1: replace struct svq1_frame_size with an array.
vf_yadif: silence a warning.
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cdgraphics.c')
| -rw-r--r-- | libavcodec/cdgraphics.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index 71d9da7ee2..6d957f31d1 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -291,6 +291,8 @@ static int cdg_decode_frame(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); return ret; } + if (!avctx->frame_number) + memset(cc->frame.data[0], 0, cc->frame.linesize[0] * avctx->height); command = bytestream_get_byte(&buf); inst = bytestream_get_byte(&buf); |