diff options
Diffstat (limited to 'libavcodec/libfdk-aacdec.c')
| -rw-r--r-- | libavcodec/libfdk-aacdec.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index d6ef9fe8c6..de1089dd8d 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -2,7 +2,7 @@ * AAC decoder wrapper * Copyright (c) 2012 Martin Storsjo * - * This file is part of Libav. + * This file is part of FFmpeg. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -239,10 +239,8 @@ static int fdk_aac_decode_frame(AVCodecContext *avctx, void *data, if (s->initialized) { frame->nb_samples = avctx->frame_size; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "ff_get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - } buf = frame->extended_data[0]; buf_size = avctx->channels * frame->nb_samples * av_get_bytes_per_sample(avctx->sample_fmt); @@ -274,10 +272,8 @@ static int fdk_aac_decode_frame(AVCodecContext *avctx, void *data, if (tmpptr) { frame->nb_samples = avctx->frame_size; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "ff_get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) goto end; - } memcpy(frame->extended_data[0], tmpptr, avctx->channels * avctx->frame_size * av_get_bytes_per_sample(avctx->sample_fmt)); |