[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec utils.c, 1.156, 1.157 opt.c, 1.7, 1.8 avcodec.h, 1.422, 1.423

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv24434/libavcodec

Modified Files:
	utils.c opt.c avcodec.h 
Log Message:
dont include opt.h in avcodec.h


Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- utils.c	12 Sep 2005 16:30:47 -0000	1.156
+++ utils.c	12 Sep 2005 18:24:48 -0000	1.157
@@ -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>

Index: opt.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/opt.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- opt.c	12 Sep 2005 10:23:52 -0000	1.7
+++ opt.c	12 Sep 2005 18:24:48 -0000	1.8
@@ -25,6 +25,7 @@
  */
  
 #include "avcodec.h"
+#include "opt.h"
  
 static double av_parse_num(const char *name, char **tail){
     double d;

Index: avcodec.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -d -r1.422 -r1.423
--- avcodec.h	12 Sep 2005 16:30:47 -0000	1.422
+++ avcodec.h	12 Sep 2005 18:24:48 -0000	1.423
@@ -12,7 +12,6 @@
 #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 @@
 					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;
 };
 
 /**