diff options
| author | Paul B Mahol <onemda@gmail.com> | 2015-02-10 14:20:32 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2015-02-10 14:20:32 +0000 |
| commit | 392d975efe9424fe7b1ab3ae308f93f8a51b6c4e (patch) | |
| tree | ab9b6192d2508d59a1041dad5ef3ef3d9234dffd /libavcodec/on2avc.c | |
| parent | 9b22e460adb2e8d6f89916c129240042275404cc (diff) | |
| download | ffmpeg-392d975efe9424fe7b1ab3ae308f93f8a51b6c4e.tar.gz | |
avcodec: fix clobbered ff_get_buffer()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/on2avc.c')
| -rw-r--r-- | libavcodec/on2avc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c index 4ad6eca4e4..4a38da00e5 100644 --- a/libavcodec/on2avc.c +++ b/libavcodec/on2avc.c @@ -848,10 +848,8 @@ static int on2avc_decode_frame(AVCodecContext * avctx, void *data, if (c->is_av500) { /* get output buffer */ frame->nb_samples = ON2AVC_SUBFRAME_SIZE; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - } if ((ret = on2avc_decode_subframe(c, buf, buf_size, frame, 0)) < 0) return ret; @@ -874,10 +872,8 @@ static int on2avc_decode_frame(AVCodecContext * avctx, void *data, /* get output buffer */ frame->nb_samples = ON2AVC_SUBFRAME_SIZE * num_frames; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - } audio_off = 0; bytestream2_init(&gb, buf, buf_size); |