Commit 32b2b7bd authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '266f2411'

* commit '266f2411':
  avplay: Check frame allocation inside video_thread()
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 15cd2a93 266f2411
...@@ -2230,6 +2230,9 @@ static int video_thread(void *arg) ...@@ -2230,6 +2230,9 @@ static int video_thread(void *arg)
int last_vfilter_idx = 0; int last_vfilter_idx = 0;
#endif #endif
if (!frame)
return AVERROR(ENOMEM);
for (;;) { for (;;) {
ret = get_video_frame(is, frame); ret = get_video_frame(is, frame);
if (ret < 0) if (ret < 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment