1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

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>
This commit is contained in:
Michael Niedermayer
2012-06-09 20:09:51 +02:00

View File

@@ -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;