mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-31 13:36:39 +02:00
Merge commit 'a72d93daa09ffbad2771f1450820941055eaf210'
* commit 'a72d93daa09ffbad2771f1450820941055eaf210': mpegvideo_enc: Check AVCodecContext allocation Conflicts: libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9ecfe0b878
@ -1283,6 +1283,8 @@ static int estimate_best_b_count(MpegEncContext *s)
|
|||||||
int64_t best_rd = INT64_MAX;
|
int64_t best_rd = INT64_MAX;
|
||||||
int best_b_count = -1;
|
int best_b_count = -1;
|
||||||
|
|
||||||
|
if (!c)
|
||||||
|
return AVERROR(ENOMEM);
|
||||||
av_assert0(scale >= 0 && scale <= 3);
|
av_assert0(scale >= 0 && scale <= 3);
|
||||||
|
|
||||||
//emms_c();
|
//emms_c();
|
||||||
|
Loading…
Reference in New Issue
Block a user