virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +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
commit 5fe1578571
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/roqvideodec.c
View File

@ -204,14 +204,15 @@ static int roq_decode_frame(AVCodecContext *avctx,
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
RoqContext *s = avctx->priv_data;
int copy= !s->current_frame->data[0] && s->last_frame->data[0];
int copy = !s->current_frame->data[0] && s->last_frame->data[0];
int ret;
if ((ret = ff_reget_buffer(avctx, s->current_frame)) < 0)
return ret;
if(copy) {
if ((ret = av_frame_copy(s->current_frame, s->last_frame)) < 0)
if (copy) {
ret = av_frame_copy(s->current_frame, s->last_frame);
if (ret < 0)
return ret;
}