virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

Merge commit '9cbae3a7d57bd2b862c37fd8123bd1fba680e801'

Browse Source 
* 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
parent af7c703715 9cbae3a7d5
commit 5fe1578571
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/roqvideodec.c
View File

@ -211,7 +211,8 @@ static int roq_decode_frame(AVCodecContext *avctx,
return ret; return ret;
if (copy) { 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; return ret;
} }