Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
50a2c65d
Commit
50a2c65d
authored
Jul 30, 2017
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vdr: fix unused variable warning
parent
ac27e93d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
modules/access/vdr.c
modules/access/vdr.c
+11
-7
No files found.
modules/access/vdr.c
View file @
50a2c65d
...
@@ -226,8 +226,7 @@ static void Close( vlc_object_t * p_this )
...
@@ -226,8 +226,7 @@ static void Close( vlc_object_t * p_this )
if
(
p_sys
->
p_meta
)
if
(
p_sys
->
p_meta
)
vlc_meta_Delete
(
p_sys
->
p_meta
);
vlc_meta_Delete
(
p_sys
->
p_meta
);
size_t
count
=
p_sys
->
p_marks
->
i_seekpoint
;
free
(
p_sys
->
offsets
);
TAB_CLEAN
(
count
,
p_sys
->
offsets
);
vlc_input_title_Delete
(
p_sys
->
p_marks
);
vlc_input_title_Delete
(
p_sys
->
p_marks
);
}
}
...
@@ -822,7 +821,6 @@ static void ImportMarks( stream_t *p_access )
...
@@ -822,7 +821,6 @@ static void ImportMarks( stream_t *p_access )
p_marks
->
i_length
=
i_frame_count
*
(
int64_t
)(
CLOCK_FREQ
/
p_sys
->
fps
);
p_marks
->
i_length
=
i_frame_count
*
(
int64_t
)(
CLOCK_FREQ
/
p_sys
->
fps
);
uint64_t
*
offsetv
=
NULL
;
uint64_t
*
offsetv
=
NULL
;
size_t
offsetc
=
0
;
/* offset for chapter positions */
/* offset for chapter positions */
int
i_chapter_offset
=
p_sys
->
fps
/
1000
*
int
i_chapter_offset
=
p_sys
->
fps
/
1000
*
...
@@ -870,10 +868,12 @@ static void ImportMarks( stream_t *p_access )
...
@@ -870,10 +868,12 @@ static void ImportMarks( stream_t *p_access )
sp
->
psz_name
=
strdup
(
line
);
sp
->
psz_name
=
strdup
(
line
);
TAB_APPEND
(
p_marks
->
i_seekpoint
,
p_marks
->
seekpoint
,
sp
);
TAB_APPEND
(
p_marks
->
i_seekpoint
,
p_marks
->
seekpoint
,
sp
);
TAB_APPEND
(
offsetc
,
offsetv
,
i_
offset
);
offsetv
=
xrealloc
(
offsetv
,
p_marks
->
i_seekpoint
*
sizeof
(
*
offset
v
)
);
for
(
int
i
=
0
;
i
+
1
<
i_file_number
;
++
i
)
for
(
int
i
=
0
;
i
+
1
<
i_file_number
;
++
i
)
offsetv
[
offsetc
-
1
]
+=
FILE_SIZE
(
i
);
i_offset
+=
FILE_SIZE
(
i
);
offsetv
[
p_marks
->
i_seekpoint
-
1
]
=
i_offset
;
}
}
/* add a chapter at the beginning if missing */
/* add a chapter at the beginning if missing */
...
@@ -885,7 +885,11 @@ static void ImportMarks( stream_t *p_access )
...
@@ -885,7 +885,11 @@ static void ImportMarks( stream_t *p_access )
sp
->
i_time_offset
=
0
;
sp
->
i_time_offset
=
0
;
sp
->
psz_name
=
strdup
(
_
(
"Start"
)
);
sp
->
psz_name
=
strdup
(
_
(
"Start"
)
);
TAB_INSERT
(
p_marks
->
i_seekpoint
,
p_marks
->
seekpoint
,
sp
,
0
);
TAB_INSERT
(
p_marks
->
i_seekpoint
,
p_marks
->
seekpoint
,
sp
,
0
);
TAB_INSERT
(
offsetc
,
offsetv
,
UINT64_C
(
0
),
0
);
offsetv
=
xrealloc
(
offsetv
,
p_marks
->
i_seekpoint
*
sizeof
(
*
offsetv
));
memmove
(
offsetv
+
1
,
offsetv
,
(
p_marks
->
i_seekpoint
-
1
)
*
sizeof
(
*
offsetv
));
offsetv
[
0
]
=
0
;
}
}
}
}
...
@@ -897,7 +901,7 @@ static void ImportMarks( stream_t *p_access )
...
@@ -897,7 +901,7 @@ static void ImportMarks( stream_t *p_access )
else
else
{
{
vlc_input_title_Delete
(
p_marks
);
vlc_input_title_Delete
(
p_marks
);
TAB_CLEAN
(
offsetc
,
offsetv
);
free
(
offsetv
);
}
}
fclose
(
marksfile
);
fclose
(
marksfile
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment