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

demux_mkv: cosmetics

This commit is contained in:
wm4 2013-04-24 21:33:33 +02:00
parent ff549a2f6a
commit 2337bc9d9b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
demux/demux_mkv.c
View File

@ -2008,7 +2008,7 @@ static void handle_realaudio(demuxer_t *demuxer, mkv_track_t *track,
demuxer_add_packet(demuxer, track->stream, dp); demuxer_add_packet(demuxer, track->stream, dp);
} }
} }
} else { // Not a codec that require reordering } else { // Not a codec that requires reordering
dp = new_demux_packet_from(buffer, size); dp = new_demux_packet_from(buffer, size);
if (track->ra_pts == mkv_d->last_pts && !mkv_d->a_skip_to_keyframe) if (track->ra_pts == mkv_d->last_pts && !mkv_d->a_skip_to_keyframe)
dp->pts = 0; dp->pts = 0;
@ -2147,7 +2147,7 @@ static int handle_block(demuxer_t *demuxer, struct block_info *block_info)
if (use_this_block) { if (use_this_block) {
if (laces > 1) { if (laces > 1) {
mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Subtitles use Matroska " mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Subtitles use Matroska "
"lacing. This is abnormal and not supported.\n"); "lacing. This is abnormal and not supported.\n");
use_this_block = 0; use_this_block = 0;
} }
} }
@ -2178,8 +2178,7 @@ static int handle_block(demuxer_t *demuxer, struct block_info *block_info)
* for packets after the first one (rather than all pts * for packets after the first one (rather than all pts
* values being the same) */ * values being the same) */
if (i == 0 || track->default_duration) if (i == 0 || track->default_duration)
dp->pts = dp->pts = mkv_d->last_pts + i * track->default_duration;
mkv_d->last_pts + i * track->default_duration;
dp->duration = block_duration / 1e9; dp->duration = block_duration / 1e9;
demuxer_add_packet(demuxer, stream, dp); demuxer_add_packet(demuxer, stream, dp);
} }