diff options
author | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
commit | e18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch) | |
tree | 199bddd30923db1175a1331191eb86ba684e9e41 /Makefile | |
parent | 3e7d483ac89289f613138002be2043ec5f479bb0 (diff) | |
parent | 5ead20bdb3328d199dad693039d18e7a05eb2465 (diff) | |
download | mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.bz2 mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.xz |
Merge branch 'remove_old_demuxers'
The merged branch doesn't actually just remove old demuxers, but also
includes a branch of cleanups and some refactoring.
Conflicts:
stream/stream.c
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 15 |
1 files changed, 1 insertions, 14 deletions
@@ -187,30 +187,17 @@ SOURCES = talloc.c \ core/timeline/tl_edl.c \ core/timeline/tl_matroska.c \ core/timeline/tl_cue.c \ - demux/asfheader.c \ - demux/aviheader.c \ - demux/aviprint.c \ demux/codec_tags.c \ demux/demux.c \ - demux/demux_asf.c \ - demux/demux_avi.c \ demux/demux_edl.c \ demux/demux_cue.c \ demux/demux_lavf.c \ demux/demux_mf.c \ demux/demux_mkv.c \ - demux/demux_mpg.c \ demux/demux_subreader.c \ - demux/demux_ts.c \ - demux/mp3_hdr.c \ - demux/parse_es.c \ - demux/mpeg_hdr.c \ - demux/demux_rawaudio.c \ - demux/demux_rawvideo.c \ + demux/demux_raw.c \ demux/ebml.c \ - demux/extension.c \ demux/mf.c \ - demux/video.c \ osdep/io.c \ osdep/numcores.c \ osdep/timer.c \ |