diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 23:30:37 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 23:30:37 +0300 |
| commit | 9ecfe0b87834576ce69401067fe1130a723eb2d4 (patch) | |
| tree | cfc802dd3308e6d1c27bb1ad50fdd0cd763932d9 /libavcodec/mpegvideo_enc.c | |
| parent | 0bc2da6dcf17e599f3d7dc6bb22880510c2a11a9 (diff) | |
| parent | a72d93daa09ffbad2771f1450820941055eaf210 (diff) | |
Merge commit 'a72d93daa09ffbad2771f1450820941055eaf210'
* commit 'a72d93daa09ffbad2771f1450820941055eaf210':
mpegvideo_enc: Check AVCodecContext allocation
Conflicts:
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 847b1164b6..53f584dac8 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1283,6 +1283,8 @@ static int estimate_best_b_count(MpegEncContext *s) int64_t best_rd = INT64_MAX; int best_b_count = -1; + if (!c) + return AVERROR(ENOMEM); av_assert0(scale >= 0 && scale <= 3); //emms_c(); |