diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-20 16:13:33 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-20 16:13:33 +0300 |
| commit | 849dc0ba31f209dfdb48146512e48ee2203d0ee6 (patch) | |
| tree | 27b3fcc37410ea5f646eb5fc2411406f2cdee175 /libmpdemux/demux_lavf.c | |
| parent | 259ea9d7034566760785fd5253f97b65ee8cd6ed (diff) | |
| parent | 7756839a147ce2421cfb4e3de046364962094b60 (diff) | |
| download | mpv-849dc0ba31f209dfdb48146512e48ee2203d0ee6.tar.bz2 mpv-849dc0ba31f209dfdb48146512e48ee2203d0ee6.tar.xz | |
Merge svn changes up to r27649
Conflicts:
Makefile
configure
libvo/x11_common.c
Diffstat (limited to 'libmpdemux/demux_lavf.c')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index d5dcd0989b..641b7cf902 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -36,10 +36,9 @@ #include "libvo/sub.h" #include "libavformat/avformat.h" +#include "libavformat/avio.h" #include "libavutil/avutil.h" -#include "libavformat/avi.h" #include "libavcodec/opt.h" -#include "libavformat/riff.h" #include "mp_taglists.h" |