dont include opt.h in avcodec.h

Originally committed as revision 4591 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-09-12 18:24:48 +00:00
parent 1471c6c2e8
commit 6fd46414db
4 changed files with 4 additions and 2 deletions

View File

@ -21,6 +21,7 @@
#include "avformat.h" #include "avformat.h"
#include "framehook.h" #include "framehook.h"
#include "dsputil.h" #include "dsputil.h"
#include "opt.h"
#ifndef CONFIG_WIN32 #ifndef CONFIG_WIN32
#include <unistd.h> #include <unistd.h>

View File

@ -12,7 +12,6 @@ extern "C" {
#endif #endif
#include "avutil.h" #include "avutil.h"
#include "opt.h"
#include <sys/types.h> /* size_t */ #include <sys/types.h> /* size_t */
//FIXME the following 2 really dont belong in here //FIXME the following 2 really dont belong in here
@ -682,7 +681,7 @@ struct AVCLASS {
or AVFormatContext, which begin with an AVClass. or AVFormatContext, which begin with an AVClass.
Needed because av_log is in libavcodec and has no visibility Needed because av_log is in libavcodec and has no visibility
of AVIn/OutputFormat */ of AVIn/OutputFormat */
AVOption *option; struct AVOption *option;
}; };
/** /**

View File

@ -25,6 +25,7 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "opt.h"
static double av_parse_num(const char *name, char **tail){ static double av_parse_num(const char *name, char **tail){
double d; double d;

View File

@ -28,6 +28,7 @@
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "integer.h" #include "integer.h"
#include "opt.h"
#include <stdarg.h> #include <stdarg.h>
#include <limits.h> #include <limits.h>
#include <float.h> #include <float.h>