Mercurial > mplayer.hg
changeset 26281:6eb659782586
Remove unnecessary includes
command.c: Don't include libmpcodecs/mp_image.h, libmpdemux/matroska.h
mplayer.c: Don't include libmpdemux/matroska.h
matroska.h: Remove declaration of already removed function
demux_mkv_change_subs and stop including demuxer.h
| author | uau |
|---|---|
| date | Tue, 01 Apr 2008 15:24:53 +0000 |
| parents | b21e1506e50b |
| children | 79ab4ecba54a |
| files | command.c libmpdemux/matroska.h mplayer.c |
| diffstat | 3 files changed, 0 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/command.c Tue Apr 01 14:19:45 2008 +0000 +++ b/command.c Tue Apr 01 15:24:53 2008 +0000 @@ -16,7 +16,6 @@ #include "m_property.h" #include "help_mp.h" #include "metadata.h" -#include "libmpcodecs/mp_image.h" #include "libmpcodecs/vf.h" #include "libmpcodecs/vd.h" #include "libvo/video_out.h" @@ -25,7 +24,6 @@ #include "libao2/audio_out.h" #include "mpcommon.h" #include "mixer.h" -#include "libmpdemux/matroska.h" #include "libmpcodecs/dec_video.h" #include "vobsub.h" #include "spudec.h"
--- a/libmpdemux/matroska.h Tue Apr 01 14:19:45 2008 +0000 +++ b/libmpdemux/matroska.h Tue Apr 01 15:24:53 2008 +0000 @@ -7,8 +7,6 @@ #ifndef MPLAYER_MATROSKA_H #define MPLAYER_MATROSKA_H -#include "demuxer.h" - #define MKV_A_AAC_2MAIN "A_AAC/MPEG2/MAIN" #define MKV_A_AAC_2LC "A_AAC/MPEG2/LC" #define MKV_A_AAC_2SBR "A_AAC/MPEG2/LC/SBR" @@ -63,6 +61,4 @@ #define MKV_S_SSA "S_SSA" // Deprecated #define MKV_S_ASS "S_ASS" // Deprecated -int demux_mkv_change_subs(demuxer_t *demuxer, int new_num); - #endif /* MPLAYER_MATROSKA_H */
--- a/mplayer.c Tue Apr 01 14:19:45 2008 +0000 +++ b/mplayer.c Tue Apr 01 15:24:53 2008 +0000 @@ -162,8 +162,6 @@ #include "stream/stream.h" #include "libmpdemux/demuxer.h" #include "libmpdemux/stheader.h" -//#include "parse_es.h" -#include "libmpdemux/matroska.h" #ifdef USE_DVDREAD #include "stream/stream_dvd.h"