Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
40c8c1a7
Commit
40c8c1a7
authored
Apr 23, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: avi: create index requires only fastseekable (fix #8793)
parent
5b9551f5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
modules/demux/avi/avi.c
modules/demux/avi/avi.c
+6
-2
No files found.
modules/demux/avi/avi.c
View file @
40c8c1a7
...
@@ -174,6 +174,7 @@ struct demux_sys_t
...
@@ -174,6 +174,7 @@ struct demux_sys_t
mtime_t
i_length
;
mtime_t
i_length
;
bool
b_seekable
;
bool
b_seekable
;
bool
b_fastseekable
;
avi_chunk_t
ck_root
;
avi_chunk_t
ck_root
;
bool
b_odml
;
bool
b_odml
;
...
@@ -289,7 +290,8 @@ static int Open( vlc_object_t * p_this )
...
@@ -289,7 +290,8 @@ static int Open( vlc_object_t * p_this )
p_sys
->
meta
=
NULL
;
p_sys
->
meta
=
NULL
;
TAB_INIT
(
p_sys
->
i_attachment
,
p_sys
->
attachment
);
TAB_INIT
(
p_sys
->
i_attachment
,
p_sys
->
attachment
);
stream_Control
(
p_demux
->
s
,
STREAM_CAN_FASTSEEK
,
&
p_sys
->
b_seekable
);
stream_Control
(
p_demux
->
s
,
STREAM_CAN_FASTSEEK
,
&
p_sys
->
b_fastseekable
);
stream_Control
(
p_demux
->
s
,
STREAM_CAN_SEEK
,
&
p_sys
->
b_seekable
);
p_demux
->
pf_control
=
Control
;
p_demux
->
pf_control
=
Control
;
p_demux
->
pf_demux
=
Demux_Seekable
;
p_demux
->
pf_demux
=
Demux_Seekable
;
...
@@ -661,7 +663,7 @@ static int Open( vlc_object_t * p_this )
...
@@ -661,7 +663,7 @@ static int Open( vlc_object_t * p_this )
if
(
i_do_index
==
1
)
/* Always fix */
if
(
i_do_index
==
1
)
/* Always fix */
{
{
aviindex:
aviindex:
if
(
p_sys
->
b_seekable
)
if
(
p_sys
->
b_
fast
seekable
)
{
{
AVI_IndexCreate
(
p_demux
);
AVI_IndexCreate
(
p_demux
);
}
}
...
@@ -2382,6 +2384,8 @@ static void AVI_IndexLoad_indx( demux_t *p_demux,
...
@@ -2382,6 +2384,8 @@ static void AVI_IndexLoad_indx( demux_t *p_demux,
}
}
else
if
(
p_indx
->
i_indextype
==
AVI_INDEX_OF_INDEXES
)
else
if
(
p_indx
->
i_indextype
==
AVI_INDEX_OF_INDEXES
)
{
{
if
(
!
p_sys
->
b_seekable
)
return
;
avi_chunk_t
ck_sub
;
avi_chunk_t
ck_sub
;
for
(
unsigned
i
=
0
;
i
<
p_indx
->
i_entriesinuse
;
i
++
)
for
(
unsigned
i
=
0
;
i
<
p_indx
->
i_entriesinuse
;
i
++
)
{
{
...
...
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