Skip to content
Snippets Groups Projects
Commit 19a9a49e authored by Reimar Döffinger's avatar Reimar Döffinger
Browse files

Simplify: reget_buffer behaves exactly like get_buffer if the buffer was

previously released, so no extra condition is necessary.

Originally committed as revision 19808 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2205da0d
No related branches found
No related tags found
No related merge requests found
...@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment