diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 21:08:33 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 21:09:11 +0100 |
commit | 32b2b7bd8c5aed23e03c2bc75ccb1d46753f8798 (patch) | |
tree | 8ef359c9f72a7f0ff9bfcb4a5562335ceb3f4e11 /ffplay.c | |
parent | 15cd2a93e7f64b5b4e4367014a78ee8f9e63c2bb (diff) | |
parent | 266f241193b2fa8c99bb8b1f007c66bedd3b7d97 (diff) | |
download | ffmpeg-32b2b7bd8c5aed23e03c2bc75ccb1d46753f8798.tar.gz |
Merge commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97'
* commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97':
avplay: Check frame allocation inside video_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
-rw-r--r-- | ffplay.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -2230,6 +2230,9 @@ static int video_thread(void *arg) int last_vfilter_idx = 0; #endif + if (!frame) + return AVERROR(ENOMEM); + for (;;) { ret = get_video_frame(is, frame); if (ret < 0) |