diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 03:51:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 03:54:40 +0100 |
| commit | b5e5ed8ea707fefcab15dbfa3fa0dc2f36e5275a (patch) | |
| tree | 8e2c8a028781da99fa256c200e635b16d496e62a /libavcodec/truemotion2.c | |
| parent | 01a0283c92b124f185ce4e814a1c5b600f1135e0 (diff) | |
| parent | 3b199d29cd597a3518136d78860e172060b9e83d (diff) | |
Merge commit '3b199d29cd597a3518136d78860e172060b9e83d'
* commit '3b199d29cd597a3518136d78860e172060b9e83d':
lavc decoders: properly initialize AVFrame.
Conflicts:
libavcodec/avs.c
libavcodec/c93.c
libavcodec/cinepak.c
libavcodec/flashsv.c
libavcodec/flicvideo.c
libavcodec/iff.c
libavcodec/mmvideo.c
libavcodec/msrle.c
libavcodec/msvideo1.c
libavcodec/qtrle.c
libavcodec/rpza.c
libavcodec/smacker.c
libavcodec/smc.c
libavcodec/tiertexseqv.c
libavcodec/truemotion1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/truemotion2.c')
| -rw-r--r-- | libavcodec/truemotion2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index 8c28a816f6..6918a17e16 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -918,9 +918,8 @@ static av_cold int decode_init(AVCodecContext *avctx) } l->avctx = avctx; - l->pic.data[0] = NULL; - avctx->pix_fmt = AV_PIX_FMT_BGR24; avcodec_get_frame_defaults(&l->pic); + avctx->pix_fmt = AV_PIX_FMT_BGR24; ff_dsputil_init(&l->dsp, avctx); |