RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Proper key frame reporting. Proper handling of "no subtitles wanted". 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10074 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
mosu 2003-05-05 19:18:22 +00:00
parent 2f8243b527
commit 2d9c3add31
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libmpdemux/demux_mkv.cpp
View File

@ -1520,10 +1520,11 @@ extern "C" int demux_mkv_open(demuxer_t *demuxer) {
// DO NOT automatically select a subtitle track and behave like DVD
// playback: only show subtitles if the user explicitely wants them.
if (dvdsub_lang != NULL)
track = find_track_by_language(mkv_d, dvdsub_lang, NULL);
else if (demuxer->sub->id >= 0)
track = NULL;
if (demuxer->sub->id >= 0)
track = find_track_by_num(mkv_d, demuxer->sub->id, NULL);
else if (dvdsub_lang != NULL)
track = find_track_by_language(mkv_d, dvdsub_lang, NULL);
if (track) {
if (strcmp(track->codec_id, MKV_S_TEXTASCII) &&
strcmp(track->codec_id, MKV_S_TEXTUTF8))
@ -1704,7 +1705,7 @@ extern "C" int demux_mkv_fill_buffer(demuxer_t *d) {
dp = new_demux_packet(data.Size());
memcpy(dp->buffer, data.Buffer(), data.Size());
dp->pts = mkv_d->last_pts;
dp->flags = 0;
dp->flags = (elements_found & 4) == 0 ? 1 : 0; // keyframe
ds_add_packet(ds, dp);
found_data++;
}