diff options
Diffstat (limited to 'libavcodec/libschroedingerenc.c')
| -rw-r--r-- | libavcodec/libschroedingerenc.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c index 40022861be..aed7818567 100644 --- a/libavcodec/libschroedingerenc.c +++ b/libavcodec/libschroedingerenc.c @@ -2,20 +2,20 @@ * Dirac encoder support via Schroedinger libraries * Copyright (c) 2008 BBC, Anuradha Suraparaju <asuraparaju at gmail dot com > * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -27,13 +27,11 @@ * (http://dirac.sourceforge.net/specification.html). */ -#undef NDEBUG -#include <assert.h> - #include <schroedinger/schro.h> #include <schroedinger/schrodebug.h> #include <schroedinger/schrovideoformat.h> +#include "libavutil/avassert.h" #include "avcodec.h" #include "internal.h" #include "libschroedinger.h" @@ -305,8 +303,7 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext, AVPacket *pk case SCHRO_STATE_HAVE_BUFFER: case SCHRO_STATE_END_OF_STREAM: enc_buf = schro_encoder_pull(encoder, &presentation_frame); - assert(enc_buf->length > 0); - assert(enc_buf->length <= buf_size); + av_assert0(enc_buf->length > 0); parse_code = enc_buf->data[4]; /* All non-frame data is prepended to actual frame data to @@ -380,10 +377,8 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext, AVPacket *pk pkt_size = p_frame_output->size; if (last_frame_in_sequence && p_schro_params->enc_buf_size > 0) pkt_size += p_schro_params->enc_buf_size; - if ((ret = ff_alloc_packet(pkt, pkt_size)) < 0) { - av_log(avccontext, AV_LOG_ERROR, "Error getting output packet of size %d.\n", pkt_size); + if ((ret = ff_alloc_packet2(avccontext, pkt, pkt_size)) < 0) goto error; - } memcpy(pkt->data, p_frame_output->p_encbuf, p_frame_output->size); avccontext->coded_frame->key_frame = p_frame_output->key_frame; |