Mercurial > mplayer.hg

diff mencoder.c @ 32209:ef21cbba62ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move libass/ass_mp.[ch] ---> ass_mp.[ch]. ass_mp.[ch] is not part of libass and no other external library glue code is kept in the same directory as the imported external library.
author diego
date Fri, 17 Sep 2010 15:13:37 +0000
parents 4614728cab25
children f6e78eef2e1b
line wrap: on
line diff
--- a/mencoder.c	Fri Sep 17 15:02:46 2010 +0000
+++ b/mencoder.c	Fri Sep 17 15:13:37 2010 +0000
@@ -58,7 +58,6 @@
 #include "input/input.h"
 #include "libaf/af_format.h"
 #include "libao2/audio_out.h"
-#include "libass/ass_mp.h"
 #include "libavcodec/avcodec.h"
 #include "libmpcodecs/ae.h"
 #include "libmpcodecs/dec_audio.h"
@@ -84,6 +83,7 @@
 #include "stream/stream_dvd.h"
 #endif
 #include "stream/stream_dvdnav.h"
+#include "ass_mp.h"
 #include "codec-cfg.h"
 #include "edl.h"
 #include "help_mp.h"