Browse Source

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

Originally committed as revision 6670 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Diego Biurrun 18 years ago
parent
commit
cb690cadaf
3 changed files with 7 additions and 7 deletions
  1. +5
    -5
      libavcodec/xvid_internal.h
  2. +1
    -1
      libavcodec/xvid_rc.c
  3. +1
    -1
      libavcodec/xvidff.c

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
*/

#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 */

+ 1
- 1
libavcodec/xvid_rc.c View File

@@ -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"



+ 1
- 1
libavcodec/xvidff.c View File

@@ -29,7 +29,7 @@
#include <unistd.h>
#include "common.h"
#include "avcodec.h"
#include "internal.h"
#include "xvid_internal.h"

/**
* Buffer management macros.


Loading…
Cancel
Save