diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-09-12 18:24:48 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-09-12 18:24:48 +0000 |
| commit | 6fd46414dbecfc41c0c70b4b8a1847d3aa277a1f (patch) | |
| tree | 5945edef18871444c703386279d853f658cdf935 /libavcodec | |
| parent | 1471c6c2e88d25a79c8f88742a94726145f81a28 (diff) | |
dont include opt.h in avcodec.h
Originally committed as revision 4591 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/opt.c | 1 | ||||
| -rw-r--r-- | libavcodec/utils.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 826329f8ac..82a198453e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -12,7 +12,6 @@ extern "C" { #endif #include "avutil.h" -#include "opt.h" #include <sys/types.h> /* size_t */ //FIXME the following 2 really dont belong in here @@ -682,7 +681,7 @@ struct AVCLASS { or AVFormatContext, which begin with an AVClass. Needed because av_log is in libavcodec and has no visibility of AVIn/OutputFormat */ - AVOption *option; + struct AVOption *option; }; /** diff --git a/libavcodec/opt.c b/libavcodec/opt.c index 80770549b9..8934c23d4e 100644 --- a/libavcodec/opt.c +++ b/libavcodec/opt.c @@ -25,6 +25,7 @@ */ #include "avcodec.h" +#include "opt.h" static double av_parse_num(const char *name, char **tail){ double d; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 3eb1e60014..8fc275bc6b 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -28,6 +28,7 @@ #include "dsputil.h" #include "mpegvideo.h" #include "integer.h" +#include "opt.h" #include <stdarg.h> #include <limits.h> #include <float.h> |