X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavformat%2Faudiointerleave.h;h=9c7b548c1d87d034bbd26caf7ab1ef68d9d2aab6;hb=fd36cf6bf6524247a8ff6788c028836fe7d9fd20;hp=c948c366fbf70662502a7988cae6b2cdb0979301;hpb=41dd680dd80d93626e133c02b92e31cabb756eeb;p=ffmpeg diff --git a/libavformat/audiointerleave.h b/libavformat/audiointerleave.h index c948c366fbf..9c7b548c1d8 100644 --- a/libavformat/audiointerleave.h +++ b/libavformat/audiointerleave.h @@ -3,20 +3,20 @@ * * Copyright (c) 2009 Baptiste Coudurier * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -26,7 +26,7 @@ #include "libavutil/fifo.h" #include "avformat.h" -typedef struct { +typedef struct AudioInterleaveContext { AVFifoBuffer *fifo; unsigned fifo_size; ///< size of currently allocated FIFO uint64_t dts; ///< current dts @@ -39,7 +39,6 @@ typedef struct { int ff_audio_interleave_init(AVFormatContext *s, const int *samples_per_frame, AVRational time_base); void ff_audio_interleave_close(AVFormatContext *s); -int ff_interleave_compare_dts(AVFormatContext *s, AVPacket *next, AVPacket *pkt); /** * Rechunk audio PCM packets per AudioInterleaveContext->samples_per_frame * and interleave them correctly.