summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-07 02:26:13 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-07 02:34:35 +0300
commit0eb321bf2c1cc0e048faff26a01f86cdd3ec254f (patch)
tree71cb9bd9ed121156d3382066c0722c73189afe04 /libmpdemux/demux_mkv.c
parent6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0 (diff)
downloadmpv-0eb321bf2c1cc0e048faff26a01f86cdd3ec254f.tar.bz2
mpv-0eb321bf2c1cc0e048faff26a01f86cdd3ec254f.tar.xz
Remove trailing whitespace from most files
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index d4ba0d0227..4f44646b56 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -92,13 +92,13 @@ typedef struct mkv_track
{
int tnum;
char *name;
-
+
char *codec_id;
int ms_compat;
char *language;
int type;
-
+
uint32_t v_width, v_height, v_dwidth, v_dheight;
float v_frate;
@@ -217,7 +217,7 @@ demux_mkv_find_track_by_num (mkv_demuxer_t *d, int n, int type)
if (d->tracks[i] != NULL && d->tracks[i]->type == type)
if (id++ == n)
return d->tracks[i];
-
+
return NULL;
}
@@ -813,7 +813,7 @@ demux_mkv_read_trackentry (demuxer_t *demuxer)
track->name);
break;
}
-
+
case MATROSKA_ID_TRACKTYPE:
{
uint64_t num = ebml_read_uint (s, &l);
@@ -1008,7 +1008,7 @@ demux_mkv_read_cues (demuxer_t *demuxer)
ebml_read_skip (s, NULL);
return 0;
}
- mkv_d->parsed_cues = realloc (mkv_d->parsed_cues,
+ mkv_d->parsed_cues = realloc (mkv_d->parsed_cues,
(mkv_d->parsed_cues_num+1)
* sizeof (off_t));
mkv_d->parsed_cues[mkv_d->parsed_cues_num++] = off;
@@ -1096,7 +1096,7 @@ demux_mkv_read_cues (demuxer_t *demuxer)
mkv_d->indexes[mkv_d->num_indexes].timecode = time;
mkv_d->indexes[mkv_d->num_indexes].filepos =mkv_d->segment_start+pos;
mp_msg (MSGT_DEMUX, MSGL_DBG2, "[mkv] |+ found cue point "
- "for track %"PRIu64": timecode %"PRIu64", filepos: %"PRIu64"\n",
+ "for track %"PRIu64": timecode %"PRIu64", filepos: %"PRIu64"\n",
track, time, mkv_d->segment_start + pos);
mkv_d->num_indexes++;
}
@@ -1395,7 +1395,7 @@ demux_mkv_read_seekhead (demuxer_t *demuxer)
ebml_read_skip (s, NULL);
return 0;
}
- mkv_d->parsed_seekhead = realloc (mkv_d->parsed_seekhead,
+ mkv_d->parsed_seekhead = realloc (mkv_d->parsed_seekhead,
(mkv_d->parsed_seekhead_num+1)
* sizeof (off_t));
mkv_d->parsed_seekhead[mkv_d->parsed_seekhead_num++] = off;
@@ -2353,7 +2353,7 @@ demux_mkv_read_block_lacing (uint8_t *buffer, uint64_t *size,
case 1: /* xiph lacing */
for (i=0; i < *laces-1; i++)
{
- lace_size[i] = 0;
+ lace_size[i] = 0;
do
{
lace_size[i] += *buffer;
@@ -2689,9 +2689,9 @@ handle_block (demuxer_t *demuxer, uint8_t *block, uint64_t length,
{
ds = demuxer->audio;
- if (mkv_d->a_skip_to_keyframe)
+ if (mkv_d->a_skip_to_keyframe)
{
- if (simpleblock)
+ if (simpleblock)
{
if (!(flags&0x80)) /*current frame isn't a keyframe*/
use_this_block = 0;
@@ -3033,7 +3033,7 @@ demux_mkv_seek (demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int
else
{
mkv_index_t *index = NULL;
- int seek_id = (demuxer->video->id < 0) ? demuxer->audio->id : demuxer->video->id;
+ int seek_id = (demuxer->video->id < 0) ? demuxer->audio->id : demuxer->video->id;
/* let's find the entry in the indexes with the smallest */
/* difference to the wanted timecode. */
@@ -3126,7 +3126,7 @@ static int
demux_mkv_control (demuxer_t *demuxer, int cmd, void *arg)
{
mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv;
-
+
switch (cmd)
{
case DEMUXER_CTRL_CORRECT_PTS:
@@ -3145,7 +3145,7 @@ demux_mkv_control (demuxer_t *demuxer, int cmd, void *arg)
}
*((int *) arg) = (int) (100 * mkv_d->last_pts / mkv_d->duration);
- return DEMUXER_CTRL_OK;
+ return DEMUXER_CTRL_OK;
case DEMUXER_CTRL_SWITCH_AUDIO:
if (demuxer->audio && demuxer->audio->sh) {