summaryrefslogtreecommitdiff
path: root/libavcodec/nuv.c
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-09-10 12:23:45 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-09-10 12:23:45 +0000
commit19a9a49e84332d7f051edb83ee4bc3afc36d80ed (patch)
treec24e46fcaa4bc090856ae407e7a5fa4b1483398e /libavcodec/nuv.c
parent2205da0d115482256e374b5c07461c02168e6fd5 (diff)
downloadffmpeg-19a9a49e84332d7f051edb83ee4bc3afc36d80ed.tar.gz
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
Diffstat (limited to 'libavcodec/nuv.c')
-rw-r--r--libavcodec/nuv.c2
1 files changed, 1 insertions, 1 deletions
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;