1
0
mirror of https://github.com/mpv-player/mpv synced 2025-02-18 13:47:04 +00:00
mpv/demux
wm4 e3f4491a24 demux_mkv: enable codec parsing for vfw-muxed files too
For some codecs, we need to invoke a codec parser (because libavcodec
will run into trouble otherwise). This was done based on the Matroska
codec field.

But this ignores handling of vfw-muxed files, which use a pseudo-codec
to signal presence of vfw structures, which we must unmangle to get the
real codec. Handle this by rearranging the code.

This fixes at least mp3-in-mkv for vfw-muxed files; typically old files.

Conflicts:
	demux/demux_mkv.c
2015-01-25 17:00:13 +09:00
..
codec_tags.c Add some missing "const"s 2014-10-10 13:44:08 +02:00
codec_tags.h audio: decouple demux and audio decoder/filter sample formats 2014-09-24 22:55:50 +02:00
demux_cue.c demux_cue: use stream_peek() 2014-11-16 18:13:41 +01:00
demux_disc.c player: always use demux_chapter 2014-11-02 17:29:41 +01:00
demux_edl.c timeline: reject mplayer2 EDL files, change EDL header 2013-11-21 15:59:00 +01:00
demux_lavf.c Check some mallocs 2014-12-17 20:09:24 +01:00
demux_libass.c demux_libass: change how external ASS subtitles are loaded 2014-03-15 22:17:51 +01:00
demux_mf.c demux: gracefully handle packet allocation failures 2014-09-16 18:11:00 +02:00
demux_mkv.c demux_mkv: enable codec parsing for vfw-muxed files too 2015-01-25 17:00:13 +09:00
demux_playlist.c demux_playlist: detect headerless m3u files by extension 2015-01-25 17:00:10 +09:00
demux_raw.c stream_cdda, demux_raw: always use s16le 2014-09-25 21:32:06 +02:00
demux_subreader.c demux: fix timestamp type for seek calls 2014-07-21 19:29:58 +02:00
demux_tv.c audio: decouple demux and audio decoder/filter sample formats 2014-09-24 22:55:50 +02:00
demux.c demux: update cache state when paused 2014-11-12 21:47:41 +01:00
demux.h player: always use demux_chapter 2014-11-02 17:29:41 +01:00
ebml.c demux_mkv: fix EBML parsing checks 2015-01-25 17:00:08 +09:00
ebml.h Move compat/ and bstr/ directory contents somewhere else 2014-08-29 12:31:52 +02:00
matroska.h demux_mkv: add S_DVBSUB 2014-06-17 22:44:27 +02:00
mf.c Audit and replace all ctype.h uses 2014-07-01 23:11:08 +02:00
mf.h demux: mp_msg conversions 2013-12-21 21:43:16 +01:00
packet.c demux: unbreak build with Libav 2014-11-03 22:30:07 +01:00
packet.h demux_mkv: implement audio skipping/trimming 2014-11-03 20:20:28 +01:00
stheader.h player: add stream selection by ffmpeg index 2014-10-21 13:19:20 +02:00