diff options
Diffstat (limited to 'libavformat/amr.c')
| -rw-r--r-- | libavformat/amr.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavformat/amr.c b/libavformat/amr.c index cc4842e..36ff9b0 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -2,20 +2,20 @@ * amr file format * Copyright (c) 2001 ffmpeg project * - * 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 */ @@ -25,6 +25,7 @@ Write and read amr data according to RFC3267, http://www.ietf.org/rfc/rfc3267.tx Only mono files are supported. */ +#include "libavutil/avassert.h" #include "avformat.h" #include "internal.h" @@ -109,7 +110,7 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt) int read, size = 0, toc, mode; int64_t pos = avio_tell(s->pb); - if (s->pb->eof_reached) { + if (url_feof(s->pb)) { return AVERROR(EIO); } @@ -130,7 +131,7 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt) size = packed_size[mode]; } else { - assert(0); + av_assert0(0); } if (!size || av_new_packet(pkt, size)) |
