diff options
| author | wm4 <wm4@nowhere> | 2015-02-27 19:44:39 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-03-03 16:02:02 +0900 |
| commit | 62cf557b5f02590893d36a5cf8a261e845fc3e15 (patch) | |
| tree | 7b2710b16d12af463fcce69bafa68bf0af4cde1e /stream/stream.c | |
| parent | 95e19523777f134a5c2cdf2c833e0ac1416ab358 (diff) | |
| download | mpv-62cf557b5f02590893d36a5cf8a261e845fc3e15.tar.bz2 mpv-62cf557b5f02590893d36a5cf8a261e845fc3e15.tar.xz | |
stream_rar: treat rar files as playlists
Refactors an older hack, which for some reason used a more complicated
way. This generates the playlist representing the contents of the rar
file in demux_playlist.c. The pseudo-demuxer could easily be separate
from the the playlist parsers (and in fact there's almost no shared
code), but I don't think this obscure feature deserves a separate file.
Sample files created with:
rar a -v20000k -m0 files.rar file1.mkv file1.mkv
(cherry picked from commit 5824eb7107a612880f68cc8e4f42cfff1bbf88ba)
Diffstat (limited to 'stream/stream.c')
| -rw-r--r-- | stream/stream.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/stream/stream.c b/stream/stream.c index fd545da7e7..4e15f498d9 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -74,8 +74,7 @@ extern const stream_info_t stream_info_dvdnav; extern const stream_info_t stream_info_bdmv_dir; extern const stream_info_t stream_info_bluray; extern const stream_info_t stream_info_bdnav; -extern const stream_info_t stream_info_rar_filter; -extern const stream_info_t stream_info_rar_entry; +extern const stream_info_t stream_info_rar; extern const stream_info_t stream_info_edl; static const stream_info_t *const stream_list[] = { @@ -115,8 +114,7 @@ static const stream_info_t *const stream_list[] = { &stream_info_null, &stream_info_mf, &stream_info_edl, - &stream_info_rar_filter, - &stream_info_rar_entry, + &stream_info_rar, &stream_info_file, NULL }; |