Mercurial > mplayer.hg
comparison libmpdemux/demux_mkv.c @ 32209:ef21cbba62ee
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 | e21b0baab10c |
| children | 2494181f252b |
comparison
equal
deleted
inserted
replaced
| 32208:4cd07921bec2 | 32209:ef21cbba62ee |
|---|---|
| 33 #include "stheader.h" | 33 #include "stheader.h" |
| 34 #include "ebml.h" | 34 #include "ebml.h" |
| 35 #include "matroska.h" | 35 #include "matroska.h" |
| 36 #include "demux_real.h" | 36 #include "demux_real.h" |
| 37 | 37 |
| 38 #include "ass_mp.h" | |
| 38 #include "mp_msg.h" | 39 #include "mp_msg.h" |
| 39 #include "help_mp.h" | 40 #include "help_mp.h" |
| 40 | 41 |
| 41 #include "vobsub.h" | 42 #include "vobsub.h" |
| 42 #include "subreader.h" | 43 #include "subreader.h" |
| 43 #include "libvo/sub.h" | 44 #include "libvo/sub.h" |
| 44 | |
| 45 #include "libass/ass_mp.h" | |
| 46 | 45 |
| 47 #include "libavutil/common.h" | 46 #include "libavutil/common.h" |
| 48 | 47 |
| 49 #ifdef CONFIG_QTX_CODECS | 48 #ifdef CONFIG_QTX_CODECS |
| 50 #include "loader/qtx/qtxsdk/components.h" | 49 #include "loader/qtx/qtxsdk/components.h" |