diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 12:54:52 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 12:56:32 +0100 |
commit | 7f8ef7876efe99e7e9d0e41b0a56530877536496 (patch) | |
tree | 89216011c97d22065a9a30f8429b295f9aff9644 /libavcodec | |
parent | 76fa78911f58c9707226559e0f57be8d47fb2fca (diff) | |
parent | e3f50f247155216229e34f165bae8c329d5a001e (diff) | |
download | ffmpeg-streaming-7f8ef7876efe99e7e9d0e41b0a56530877536496.zip ffmpeg-streaming-7f8ef7876efe99e7e9d0e41b0a56530877536496.tar.gz |
Merge commit 'e3f50f247155216229e34f165bae8c329d5a001e'
* commit 'e3f50f247155216229e34f165bae8c329d5a001e':
dnxhdenc: check negative index
Conflicts:
libavcodec/dnxhdenc.c
Not merged, the cid index thats taken out of our table will be found again in
said table.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/dnxhdenc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index d438fbb..f5a803b 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -314,6 +314,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) index = ff_dnxhd_get_cid_table(ctx->cid); av_assert0(index >= 0); + ctx->cid_table = &ff_dnxhd_cid_table[index]; ctx->m.avctx = avctx; |