comparison nuv.c @ 10154:8f578f86c51a libavcodec

Simplify: reget_buffer behaves exactly like get_buffer if the buffer was previously released, so no extra condition is necessary.
author reimar
date Thu, 10 Sep 2009 12:23:45 +0000
parents 54bc8a2727b0
children 8a4984c5cacc
comparison
equal deleted inserted replaced
10153:7a63015e4627 10154:8f578f86c51a
200 if (keyframe && c->pic.data[0]) 200 if (keyframe && c->pic.data[0])
201 avctx->release_buffer(avctx, &c->pic); 201 avctx->release_buffer(avctx, &c->pic);
202 c->pic.reference = 3; 202 c->pic.reference = 3;
203 c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE | 203 c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE |
204 FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; 204 FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
205 result = keyframe ? avctx->get_buffer(avctx, &c->pic) : avctx->reget_buffer(avctx, &c->pic); 205 result = avctx->reget_buffer(avctx, &c->pic);
206 if (result < 0) { 206 if (result < 0) {
207 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); 207 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
208 return -1; 208 return -1;
209 } 209 }
210 210