mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-03 06:53:23 +02:00
Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e'
* commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e': h264: check one context_init() allocation Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
921c1d4c95
@ -1709,7 +1709,11 @@ static int decode_update_thread_context(AVCodecContext *dst,
|
|||||||
av_log(dst, AV_LOG_ERROR, "Could not allocate memory for h264\n");
|
av_log(dst, AV_LOG_ERROR, "Could not allocate memory for h264\n");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
context_init(h);
|
ret = context_init(h);
|
||||||
|
if (ret < 0) {
|
||||||
|
av_log(dst, AV_LOG_ERROR, "context_init() failed.\n");
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
|
Loading…
Reference in New Issue
Block a user