# HG changeset patch
# User michael
# Date 1126549488 0
# Node ID 4d91f38477ee65501e105d09ce120a544fe3a9c0
# Parent  d0b61801ea47a4ea7fefdf0f07571e7aeeffd43f
dont include opt.h in avcodec.h

diff -r d0b61801ea47 -r 4d91f38477ee avcodec.h
--- a/avcodec.h	Mon Sep 12 16:30:47 2005 +0000
+++ b/avcodec.h	Mon Sep 12 18:24:48 2005 +0000
@@ -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;
 };
 
 /**
diff -r d0b61801ea47 -r 4d91f38477ee opt.c
--- a/opt.c	Mon Sep 12 16:30:47 2005 +0000
+++ b/opt.c	Mon Sep 12 18:24:48 2005 +0000
@@ -25,6 +25,7 @@
  */
  
 #include "avcodec.h"
+#include "opt.h"
  
 static double av_parse_num(const char *name, char **tail){
     double d;
diff -r d0b61801ea47 -r 4d91f38477ee utils.c
--- a/utils.c	Mon Sep 12 16:30:47 2005 +0000
+++ b/utils.c	Mon Sep 12 18:24:48 2005 +0000
@@ -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>