On Fri, Sep 28, 2012 at 8:20 AM, Diego Biurrun <[email protected]> wrote: > From: Nathan Caldwell <[email protected]> > > Signed-off-by: Diego Biurrun <[email protected]> > --- > Now with missing multiple inclusion guards and shared function in a .c file. > > Changelog | 2 +- > doc/general.texi | 2 +- > libavcodec/Makefile | 5 +- > libavcodec/allcodecs.c | 2 +- > libavcodec/libopus.c | 47 ++++++ > libavcodec/libopus.h | 27 +++ > libavcodec/libopusdec.c | 27 +--- > libavcodec/libopusenc.c | 422 > +++++++++++++++++++++++++++++++++++++++++++++++ > libavcodec/version.h | 2 +- > 9 files changed, 507 insertions(+), 29 deletions(-) > create mode 100644 libavcodec/libopus.c > create mode 100644 libavcodec/libopus.h > create mode 100644 libavcodec/libopusenc.c > > diff --git a/libavcodec/libopus.c b/libavcodec/libopus.c > new file mode 100644 > index 0000000..559a84b > --- /dev/null > +++ b/libavcodec/libopus.c > @@ -0,0 +1,47 @@ > +/* > + * libopus encoder/decoder common code > + * Copyright (c) 2012 Nicolas George > + * > + * This file is part of libav. > + * > + * 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. > + * > + * 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 libav; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 > USA > + */ > + > +#include <opus_defines.h> > + > +#include "libavutil/error.h" > +#include "libopus.h"
This needs to include libavutil/common.h for MKTAG (via AVERROR). libavutil/common.h can probably be removed from the encoder (maybe the decoder as well?), although it doesn't hurt leaving it there. The rest looks good. -- -Nathan Caldwell _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
