From 19a9a49e84332d7f051edb83ee4bc3afc36d80ed Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Thu, 10 Sep 2009 12:23:45 +0000 Subject: 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 --- libavcodec/nuv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/nuv.c') diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 4f049baf90..dfc26e4ebc 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -202,7 +202,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, c->pic.reference = 3; c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE | 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) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; -- cgit v1.2.3