Commit f56035fc authored by reimar's avatar reimar

Simplify: reget_buffer behaves exactly like get_buffer if the buffer was

previously released, so no extra condition is necessary.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19808 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 38221c2b
...@@ -202,7 +202,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, ...@@ -202,7 +202,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
c->pic.reference = 3; c->pic.reference = 3;
c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE | c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE |
FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
result = keyframe ? avctx->get_buffer(avctx, &c->pic) : avctx->reget_buffer(avctx, &c->pic); result = avctx->reget_buffer(avctx, &c->pic);
if (result < 0) { if (result < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment