har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename internal.h --> xvid_internal.h, it clashes with libavutil/internal.h.

Browse Source 
Originally committed as revision 6670 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-10-12 11:51:34 +00:00
parent a5db5bda07
commit cb690cadaf
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/internal.h → libavcodec/xvid_internal.h
View File

@ -18,15 +18,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef INTERNAL_H #ifndef XVID_INTERNAL_H
#define INTERNAL_H #define XVID_INTERNAL_H
/** /**
* @file internal.h * @file xvid_internal.h
* common functions for internal libavcodec use * common functions for use with the XviD wrappers
*/ */
int av_tempfile(char *prefix, char **filename); int av_tempfile(char *prefix, char **filename);
#endif /* INTERNAL_H */ #endif /* XVID_INTERNAL_H */

2
libavcodec/xvid_rc.c
View File

@ -23,7 +23,7 @@
#include <xvid.h> #include <xvid.h>
#include <unistd.h> #include <unistd.h>
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "xvid_internal.h"
//#include "dsputil.h" //#include "dsputil.h"
#include "mpegvideo.h" #include "mpegvideo.h"

2
libavcodec/xvidff.c
View File

@ -29,7 +29,7 @@
#include <unistd.h> #include <unistd.h>
#include "common.h" #include "common.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "xvid_internal.h"
/** /**
* Buffer management macros. * Buffer management macros.