Commit 31991f9d authored by diego's avatar diego

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6670 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 73539127
......@@ -18,15 +18,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef INTERNAL_H
#define INTERNAL_H
#ifndef XVID_INTERNAL_H
#define XVID_INTERNAL_H
/**
* @file internal.h
* common functions for internal libavcodec use
* @file xvid_internal.h
* common functions for use with the XviD wrappers
*/
int av_tempfile(char *prefix, char **filename);
#endif /* INTERNAL_H */
#endif /* XVID_INTERNAL_H */
......@@ -23,7 +23,7 @@
#include <xvid.h>
#include <unistd.h>
#include "avcodec.h"
#include "internal.h"
#include "xvid_internal.h"
//#include "dsputil.h"
#include "mpegvideo.h"
......
......@@ -29,7 +29,7 @@
#include <unistd.h>
#include "common.h"
#include "avcodec.h"
#include "internal.h"
#include "xvid_internal.h"
/**
* Buffer management macros.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment