Commit 94632dbb authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix return value of get_video_frame if avcodec_decode_video fails
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2138bc16 143a5390
......@@ -1505,7 +1505,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
}
if(avcodec_decode_video2(is->video_st->codec, frame, &got_picture, pkt) < 0)
return -1;
return 0;
if (got_picture) {
int ret = 1;
......
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