diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-09-26 14:25:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-09-26 14:25:22 +0000 |
| commit | 6ed040408b26d8b5c896e60303a3bef6a39fa910 (patch) | |
| tree | ba2292b108c07c933607e39d2ba8e3114e0221ff /libavformat | |
| parent | cba322d76d4a00b659d7de030018d6003820c715 (diff) | |
| download | ffmpeg-6ed040408b26d8b5c896e60303a3bef6a39fa910.tar.gz | |
Move AVOptions from libavcodec to libavutil
Originally committed as revision 25210 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avio.c | 2 | ||||
| -rw-r--r-- | libavformat/http.c | 2 | ||||
| -rw-r--r-- | libavformat/options.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index 9d50b48460..bf075d24ae 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -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 --git a/libavformat/http.c b/libavformat/http.c index e26da072cc..f58c78a49b 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -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 --git a/libavformat/options.c b/libavformat/options.c index 3be0a3d17d..cba6436c29 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -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 --git a/libavformat/utils.c b/libavformat/utils.c index 277201538d..a445e0b861 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -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" |