summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-07 14:26:02 +0200
committerwm4 <wm4@nowhere>2012-09-18 21:07:30 +0200
commitc323592c3ac8557e09b8235bd43196f968e91168 (patch)
tree992d1f0c815ca14520d52bdfb655033e1165bafd /Makefile
parentb94cdc4bafddc50ec5e1a38f9a9b85d069a21817 (diff)
downloadmpv-c323592c3ac8557e09b8235bd43196f968e91168.tar.bz2
mpv-c323592c3ac8557e09b8235bd43196f968e91168.tar.xz
libmpdemux: add back demux_mpg
Apparently this was needed for good DVD playback. This demuxer has been removed in 1fde09db6f4ce. All code added comes from the revision before that. Some other bits have been removed in later commits, and are added back as well. Usage of memalign() is replaced by av_malloc(). As far as I can tell, this memory is never free'd or reallocated, so no calls to av_free() have been added. The code re-added to video.c is plain horrible, full of code duplication, full of demuxer/codecs specifics, but apparently needed. Unrelated to re-adding the demuxer, re-add one codepath for DEMUXER_TYPE_TV, which was accidentally removed in the same commit demux_mpg was removed. The closed captions decoder is not re-added.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f66d69e792..34e4bdef8f 100644
--- a/Makefile
+++ b/Makefile
@@ -234,6 +234,10 @@ SRCS_COMMON = asxparser.c \
libmpdemux/demux_lavf.c \
libmpdemux/demux_mf.c \
libmpdemux/demux_mkv.c \
+ libmpdemux/demux_mpg.c \
+ libmpdemux/mp3_hdr.c \
+ libmpdemux/parse_es.c \
+ libmpdemux/mpeg_hdr.c \
libmpdemux/demux_rawaudio.c \
libmpdemux/demux_rawvideo.c \
libmpdemux/ebml.c \