Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix return value of get_video_frame if avcodec_decode_video fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 1 insertions, 1 deletions

diff --git a/ffplay.c b/ffplay.c
index c8d768fb27..7cd3ba2d85 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -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;