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
5eb56283
Commit
5eb56283
authored
Feb 09, 2016
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mov: Use the correct type for size
An AVIO offset is int64_t. Bug-Id: 921
parent
8d34a2f8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
mov.c
libavformat/mov.c
+5
-5
No files found.
libavformat/mov.c
View file @
5eb56283
...
...
@@ -1586,7 +1586,7 @@ static void mov_parse_stsd_audio(MOVContext *c, AVIOContext *pb,
static
void
mov_parse_stsd_subtitle
(
MOVContext
*
c
,
AVIOContext
*
pb
,
AVStream
*
st
,
MOVStreamContext
*
sc
,
int
size
)
int
64_t
size
)
{
// ttxt stsd contains display flags, justification, background
// color, fonts, and default styles, so fake an atom to read it
...
...
@@ -1651,7 +1651,7 @@ static int mov_rewrite_dvd_sub_extradata(AVStream *st)
static
int
mov_parse_stsd_data
(
MOVContext
*
c
,
AVIOContext
*
pb
,
AVStream
*
st
,
MOVStreamContext
*
sc
,
int
size
)
int
64_t
size
)
{
int
ret
;
...
...
@@ -1739,7 +1739,7 @@ static int mov_finalize_stsd_codec(MOVContext *c, AVIOContext *pb,
static
int
mov_skip_multiple_stsd
(
MOVContext
*
c
,
AVIOContext
*
pb
,
int
codec_tag
,
int
format
,
int
size
)
int
64_t
size
)
{
int
video_codec_id
=
ff_codec_get_id
(
ff_codec_movvideo_tags
,
format
);
...
...
@@ -1781,7 +1781,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
int
ret
,
dref_id
=
1
;
MOVAtom
a
=
{
AV_RL32
(
"stsd"
)
};
int64_t
start_pos
=
avio_tell
(
pb
);
uint32_t
size
=
avio_rb32
(
pb
);
/* size */
int64_t
size
=
avio_rb32
(
pb
);
/* size */
uint32_t
format
=
avio_rl32
(
pb
);
/* data format */
if
(
size
>=
16
)
{
...
...
@@ -2555,7 +2555,7 @@ static int mov_read_ilst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return
ret
;
}
static
int
mov_read_replaygain
(
MOVContext
*
c
,
AVIOContext
*
pb
,
int
size
)
static
int
mov_read_replaygain
(
MOVContext
*
c
,
AVIOContext
*
pb
,
int
64_t
size
)
{
int64_t
end
=
avio_tell
(
pb
)
+
size
;
uint8_t
*
key
=
NULL
,
*
val
=
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