1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00

Merge commit '9cbae3a7d57bd2b862c37fd8123bd1fba680e801'

* commit '9cbae3a7d57bd2b862c37fd8123bd1fba680e801':
  roqvideodec: use av_frame_copy

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-27 14:07:36 +01:00
commit 5fe1578571

View File

@ -211,7 +211,8 @@ static int roq_decode_frame(AVCodecContext *avctx,
return ret;
if (copy) {
if ((ret = av_frame_copy(s->current_frame, s->last_frame)) < 0)
ret = av_frame_copy(s->current_frame, s->last_frame);
if (ret < 0)
return ret;
}