diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:07:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:07:37 +0100 |
| commit | 5219afc09d8e97e18917738cbc052f903df9a619 (patch) | |
| tree | 324177cb47f114fb5dabb34f96833ee54b269c6d /libavcodec/dxa.c | |
| parent | bfb1f44d246f4ed97d5cad9c1eace8a20951ff76 (diff) | |
| parent | 2d2a92f72199823a92e4e226c32e42a27ec801c0 (diff) | |
| download | ffmpeg-5219afc09d8e97e18917738cbc052f903df9a619.tar.gz | |
Merge commit '2d2a92f72199823a92e4e226c32e42a27ec801c0'
* commit '2d2a92f72199823a92e4e226c32e42a27ec801c0':
dxa: use the AVFrame API properly.
qpeg: use the AVFrame API properly.
cin video: use the AVFrame API properly.
msvideo1: use the AVFrame API properly.
Conflicts:
libavcodec/dsicinav.c
libavcodec/dxa.c
libavcodec/msvideo1.c
libavcodec/qpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dxa.c')
| -rw-r--r-- | libavcodec/dxa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index 2704852768..1d96f10ef4 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -321,12 +321,12 @@ static av_cold int decode_init(AVCodecContext *avctx) { DxaDecContext * const c = avctx->priv_data; - avctx->pix_fmt = AV_PIX_FMT_PAL8; - c->prev = av_frame_alloc(); if (!c->prev) return AVERROR(ENOMEM); + avctx->pix_fmt = AV_PIX_FMT_PAL8; + c->dsize = avctx->width * avctx->height * 2; c->decomp_buf = av_malloc(c->dsize); if (!c->decomp_buf) { |