diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 13:54:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 13:56:52 +0200 |
| commit | b222e0773c78918a59e7748b56eed0bdd8afa043 (patch) | |
| tree | bdeddf2e8604da5131c52f2d70ae70e320cf5c5e /libavcodec/indeo4.c | |
| parent | 35bb74900b951dccdc7481e98a00246f59ec2420 (diff) | |
| parent | e121ac634ba324a318f4a97f978dcfb48da6b735 (diff) | |
Merge commit 'e121ac634ba324a318f4a97f978dcfb48da6b735'
* commit 'e121ac634ba324a318f4a97f978dcfb48da6b735':
indeo45: use is_indeo4 context flag instead of checking codec ID
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo4.c')
| -rw-r--r-- | libavcodec/indeo4.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index ada44af17f..7adfcbc9ca 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -663,6 +663,8 @@ static av_cold int decode_init(AVCodecContext *avctx) ctx->switch_buffers = switch_buffers; ctx->is_nonnull_frame = is_nonnull_frame; + ctx->is_indeo4 = 1; + ctx->p_frame = av_frame_alloc(); if (!ctx->p_frame) return AVERROR(ENOMEM); |