# HG changeset patch
# User michael
# Date 1285511122 0
# Node ID fed4be3337717ea97a1651f9f5213d523b8dcd60
# Parent  74295564eed04c99b35a22c29e351b75fba6d3e0
Move AVOptions from libavcodec to libavutil

diff -r 74295564eed0 -r fed4be333771 avio.c
--- a/avio.c	Sun Sep 26 13:56:50 2010 +0000
+++ b/avio.c	Sun Sep 26 14:25:22 2010 +0000
@@ -23,7 +23,7 @@
 #define _XOPEN_SOURCE 600
 #include <unistd.h>
 #include "libavutil/avstring.h"
-#include "libavcodec/opt.h"
+#include "libavutil/opt.h"
 #include "os_support.h"
 #include "avformat.h"
 #if CONFIG_NETWORK
diff -r 74295564eed0 -r fed4be333771 http.c
--- a/http.c	Sun Sep 26 13:56:50 2010 +0000
+++ b/http.c	Sun Sep 26 14:25:22 2010 +0000
@@ -28,7 +28,7 @@
 #include "http.h"
 #include "os_support.h"
 #include "httpauth.h"
-#include "libavcodec/opt.h"
+#include "libavutil/opt.h"
 
 /* XXX: POST protocol is not completely implemented because ffmpeg uses
    only a subset of it. */
diff -r 74295564eed0 -r fed4be333771 options.c
--- a/options.c	Sun Sep 26 13:56:50 2010 +0000
+++ b/options.c	Sun Sep 26 14:25:22 2010 +0000
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "libavcodec/opt.h"
+#include "libavutil/opt.h"
 
 /**
  * @file
diff -r 74295564eed0 -r fed4be333771 utils.c
--- a/utils.c	Sun Sep 26 13:56:50 2010 +0000
+++ b/utils.c	Sun Sep 26 14:25:22 2010 +0000
@@ -21,7 +21,7 @@
 #include "avformat.h"
 #include "internal.h"
 #include "libavcodec/internal.h"
-#include "libavcodec/opt.h"
+#include "libavutil/opt.h"
 #include "metadata.h"
 #include "libavutil/avstring.h"
 #include "riff.h"