diff options
author | wm4 <wm4@nowhere> | 2013-06-21 21:34:55 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-06-25 00:11:56 +0200 |
commit | 98388c0c073906f4485420485e27a14e8d957a2d (patch) | |
tree | b2bd98d6b502d106e07ef17b0a918464e69756ac /demux/demux.h | |
parent | b37147744e34c0f23acb391de6bd04a0a1dc8cca (diff) | |
download | mpv-98388c0c073906f4485420485e27a14e8d957a2d.tar.bz2 mpv-98388c0c073906f4485420485e27a14e8d957a2d.tar.xz |
subreader: turn into actual demuxer
subreader.c (before this commit renamed to demux_subreader.c) was
special cased to the -sub option. The plan is using the normal demuxer
codepath for all subtitle formats (so we can prefer libavformat demuxers
for most formats).
There are some subtle changes. The probe size is restricted to 32 KB
(instead of unlimitted + giving up after 100 lines of input). For
formats like MicroDVD, the video FPS isn't used anymore, because it's
not available on the subtitle demuxer level. Instead, hardcode it to
23.976 FPS (libavformat seems to do the same). The user can probably
still use -sub-fps to fix the timing. Checking the file extension for
".utf"/".utf8"/".utf-8" is simply removed (seems worthless, was in the
way, and I've never seen this anywhere).
Diffstat (limited to 'demux/demux.h')
-rw-r--r-- | demux/demux.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/demux/demux.h b/demux/demux.h index bf16001c0f..9c10ca0201 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -71,6 +71,7 @@ enum demuxer_type { DEMUXER_TYPE_MNG, DEMUXER_TYPE_EDL, DEMUXER_TYPE_CUE, + DEMUXER_TYPE_SUBREADER, /* Values after this are for internal use and can not be selected * as demuxer type by the user (-demuxer option). */ |