diff options
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/demux.c | 2 | ||||
| -rw-r--r-- | demux/demux_mkv.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/demux/demux.c b/demux/demux.c index 25f31a3f60..5de6b84745 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -1002,7 +1002,7 @@ struct demuxer *demux_open_withparams(struct MPOpts *opts, // format, instead of reyling on libav to auto-detect the stream's format // correctly. switch (file_format) { - case DEMUXER_TYPE_MPEG_PS: + //case DEMUXER_TYPE_MPEG_PS: //case DEMUXER_TYPE_MPEG_TS: case DEMUXER_TYPE_Y4M: case DEMUXER_TYPE_NSV: diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 828479e50f..914ace3a41 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -2075,6 +2075,7 @@ static void handle_realaudio(demuxer_t *demuxer, mkv_track_t *track, } } +#if NEED_WAVPACK_PARSE // Copied from libavformat/matroskadec.c (FFmpeg 310f9dd / 2013-05-30) // Originally added with Libav commit 9b6f47c // License: LGPL v2.1 or later @@ -2153,6 +2154,7 @@ fail: talloc_free(dst); return -1; } +#endif static void mkv_parse_packet(mkv_track_t *track, bstr *buffer) { |