diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-23 14:36:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-23 14:53:21 +0100 |
| commit | def18e5470bdcddb9d737784cc6ae427c195da7c (patch) | |
| tree | 1fbf600ae18a94ff1c87e4c8512e2e708b6f3c24 /libavcodec/4xm.c | |
| parent | 2f9903f66220b3f175c66e8543ff6066beaa7c66 (diff) | |
| parent | b047c68783aa4042b322af7af043b643d5daf09c (diff) | |
Merge commit 'b047c68783aa4042b322af7af043b643d5daf09c'
* commit 'b047c68783aa4042b322af7af043b643d5daf09c':
4xm: don't rely on get_buffer() initializing the frame.
huffyuv: split encoder and decoder into separate files.
lavc: make pkt_{p,d}ts doxy less confusing
Conflicts:
libavcodec/Makefile
libavcodec/huffyuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/4xm.c')
| -rw-r--r-- | libavcodec/4xm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 05bc280067..c7e3c68ccf 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -901,6 +901,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } + for (i=0; i<avctx->height; i++) + memset(f->last_picture.data[0] + i*f->last_picture.linesize[0], 0, 2*avctx->width); } p->pict_type = AV_PICTURE_TYPE_P; |