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>
2012-06-09 20:09:51 +02:00
parent 2138bc16fd 143a5390bf
commit 94632dbb1e
1 changed files with 1 additions and 1 deletions
--- 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;