diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-02-07 14:37:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-16 23:00:30 +0100 |
| commit | 7ffe76e540297ad4df2896064f83cb1adbd81fd9 (patch) | |
| tree | 4510accdfd282fafb4f8caae1055c76ebf45e4c0 /ffserver.c | |
| parent | fad8143f5b9689e0e2dafe46500d944cfa58a911 (diff) | |
| download | ffmpeg-7ffe76e540297ad4df2896064f83cb1adbd81fd9.tar.gz | |
Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c index 9a3240808b..cbf04aa4a5 100644 --- a/ffserver.c +++ b/ffserver.c @@ -36,7 +36,7 @@ #include "libavutil/avstring.h" #include "libavutil/lfg.h" #include "libavutil/random_seed.h" -#include "libavcore/parseutils.h" +#include "libavutil/parseutils.h" #include "libavcodec/opt.h" #include <stdarg.h> #include <unistd.h> |