From: Diego Biurrun Date: Thu, 12 Oct 2006 11:51:34 +0000 (+0000) Subject: Rename internal.h --> xvid_internal.h, it clashes with libavutil/internal.h. X-Git-Tag: v0.5~11419 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=cb690cadaf25c6574e58cd05be2881780c3b5bbb;hp=a5db5bda07fa3cec06024d1e18fcbcb855a37d37 Rename internal.h --> xvid_internal.h, it clashes with libavutil/internal.h. Originally committed as revision 6670 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavcodec/internal.h b/libavcodec/internal.h deleted file mode 100644 index adeb11e05d..0000000000 --- a/libavcodec/internal.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * copyright (C) 2006 Corey Hickey - * - * This file is part of FFmpeg. - * - * 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. - * - * 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 FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef INTERNAL_H -#define INTERNAL_H - -/** - * @file internal.h - * common functions for internal libavcodec use - */ - - -int av_tempfile(char *prefix, char **filename); - -#endif /* INTERNAL_H */ diff --git a/libavcodec/xvid_internal.h b/libavcodec/xvid_internal.h new file mode 100644 index 0000000000..49c59c2055 --- /dev/null +++ b/libavcodec/xvid_internal.h @@ -0,0 +1,32 @@ +/* + * copyright (C) 2006 Corey Hickey + * + * This file is part of FFmpeg. + * + * 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. + * + * 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef XVID_INTERNAL_H +#define XVID_INTERNAL_H + +/** + * @file xvid_internal.h + * common functions for use with the XviD wrappers + */ + + +int av_tempfile(char *prefix, char **filename); + +#endif /* XVID_INTERNAL_H */ diff --git a/libavcodec/xvid_rc.c b/libavcodec/xvid_rc.c index b1d1cffb1b..6a0029e6d8 100644 --- a/libavcodec/xvid_rc.c +++ b/libavcodec/xvid_rc.c @@ -23,7 +23,7 @@ #include #include #include "avcodec.h" -#include "internal.h" +#include "xvid_internal.h" //#include "dsputil.h" #include "mpegvideo.h" diff --git a/libavcodec/xvidff.c b/libavcodec/xvidff.c index 7341e52144..e48bfe558d 100644 --- a/libavcodec/xvidff.c +++ b/libavcodec/xvidff.c @@ -29,7 +29,7 @@ #include #include "common.h" #include "avcodec.h" -#include "internal.h" +#include "xvid_internal.h" /** * Buffer management macros.