Mercurial > libavcodec.hg

changeset 2880:4d91f38477ee libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dont include opt.h in avcodec.h
author michael
date Mon, 12 Sep 2005 18:24:48 +0000
parents d0b61801ea47
children c2cb03ea51ac
files avcodec.h opt.c utils.c
diffstat 3 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
 };
 
 /**
--- 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;
--- 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>