Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
5292dac3
Commit
5292dac3
authored
May 25, 2013
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/mov: Rename alt_sample_size so its name matches what it is
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
7e03886b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
isom.h
libavformat/isom.h
+1
-1
mov.c
libavformat/mov.c
+2
-2
No files found.
libavformat/isom.h
View file @
5292dac3
...
@@ -110,7 +110,7 @@ typedef struct MOVStreamContext {
...
@@ -110,7 +110,7 @@ typedef struct MOVStreamContext {
int
ctts_index
;
int
ctts_index
;
int
ctts_sample
;
int
ctts_sample
;
unsigned
int
sample_size
;
///< may contain value calculated from stsd or value from stsz atom
unsigned
int
sample_size
;
///< may contain value calculated from stsd or value from stsz atom
unsigned
int
alt
_sample_size
;
///< always contains sample size from stsz atom
unsigned
int
stsz
_sample_size
;
///< always contains sample size from stsz atom
unsigned
int
sample_count
;
unsigned
int
sample_count
;
int
*
sample_sizes
;
int
*
sample_sizes
;
int
keyframe_absent
;
int
keyframe_absent
;
...
...
libavformat/mov.c
View file @
5292dac3
...
@@ -1721,7 +1721,7 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom)
...
@@ -1721,7 +1721,7 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom)
sample_size
=
avio_rb32
(
pb
);
sample_size
=
avio_rb32
(
pb
);
if
(
!
sc
->
sample_size
)
/* do not overwrite value computed in stsd */
if
(
!
sc
->
sample_size
)
/* do not overwrite value computed in stsd */
sc
->
sample_size
=
sample_size
;
sc
->
sample_size
=
sample_size
;
sc
->
alt
_sample_size
=
sample_size
;
sc
->
stsz
_sample_size
=
sample_size
;
field_size
=
32
;
field_size
=
32
;
}
else
{
}
else
{
sample_size
=
0
;
sample_size
=
0
;
...
@@ -2018,7 +2018,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
...
@@ -2018,7 +2018,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
}
}
if
(
keyframe
)
if
(
keyframe
)
distance
=
0
;
distance
=
0
;
sample_size
=
sc
->
alt_sample_size
>
0
?
sc
->
alt
_sample_size
:
sc
->
sample_sizes
[
current_sample
];
sample_size
=
sc
->
stsz_sample_size
>
0
?
sc
->
stsz
_sample_size
:
sc
->
sample_sizes
[
current_sample
];
if
(
sc
->
pseudo_stream_id
==
-
1
||
if
(
sc
->
pseudo_stream_id
==
-
1
||
sc
->
stsc_data
[
stsc_index
].
id
-
1
==
sc
->
pseudo_stream_id
)
{
sc
->
stsc_data
[
stsc_index
].
id
-
1
==
sc
->
pseudo_stream_id
)
{
AVIndexEntry
*
e
=
&
st
->
index_entries
[
st
->
nb_index_entries
++
];
AVIndexEntry
*
e
=
&
st
->
index_entries
[
st
->
nb_index_entries
++
];
...
...
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