Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
f7f5370b
Commit
f7f5370b
authored
Oct 02, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mov: add option to ignore edit lists.
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
e97e0eff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
isom.h
libavformat/isom.h
+1
-0
mov.c
libavformat/mov.c
+3
-1
No files found.
libavformat/isom.h
View file @
f7f5370b
...
@@ -161,6 +161,7 @@ typedef struct MOVContext {
...
@@ -161,6 +161,7 @@ typedef struct MOVContext {
int
itunes_metadata
;
///< metadata are itunes style
int
itunes_metadata
;
///< metadata are itunes style
int
chapter_track
;
int
chapter_track
;
int
use_absolute_path
;
int
use_absolute_path
;
int
ignore_editlist
;
int64_t
next_root_atom
;
///< offset of the next root atom
int64_t
next_root_atom
;
///< offset of the next root atom
}
MOVContext
;
}
MOVContext
;
...
...
libavformat/mov.c
View file @
f7f5370b
...
@@ -2626,7 +2626,7 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
...
@@ -2626,7 +2626,7 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
int
i
,
edit_count
,
version
,
edit_start_index
=
0
;
int
i
,
edit_count
,
version
,
edit_start_index
=
0
;
int
unsupported
=
0
;
int
unsupported
=
0
;
if
(
c
->
fc
->
nb_streams
<
1
)
if
(
c
->
fc
->
nb_streams
<
1
||
c
->
ignore_editlist
)
return
0
;
return
0
;
sc
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
]
->
priv_data
;
sc
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
]
->
priv_data
;
...
@@ -3337,6 +3337,8 @@ static const AVOption options[] = {
...
@@ -3337,6 +3337,8 @@ static const AVOption options[] = {
"allow using absolute path when opening alias, this is a possible security issue"
,
"allow using absolute path when opening alias, this is a possible security issue"
,
offsetof
(
MOVContext
,
use_absolute_path
),
FF_OPT_TYPE_INT
,
{.
dbl
=
0
},
offsetof
(
MOVContext
,
use_absolute_path
),
FF_OPT_TYPE_INT
,
{.
dbl
=
0
},
0
,
1
,
AV_OPT_FLAG_VIDEO_PARAM
|
AV_OPT_FLAG_DECODING_PARAM
},
0
,
1
,
AV_OPT_FLAG_VIDEO_PARAM
|
AV_OPT_FLAG_DECODING_PARAM
},
{
"ignore_editlist"
,
""
,
offsetof
(
MOVContext
,
ignore_editlist
),
FF_OPT_TYPE_INT
,
{.
dbl
=
0
},
0
,
1
,
AV_OPT_FLAG_VIDEO_PARAM
|
AV_OPT_FLAG_DECODING_PARAM
},
{
NULL
}
{
NULL
}
};
};
...
...
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