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
95ce02b3
Commit
95ce02b3
authored
Jul 12, 2017
by
Sean McGovern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rmdec: don't ignore the return value of av_get_packet()
parent
825e463a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
5 deletions
+14
-5
rmdec.c
libavformat/rmdec.c
+14
-5
No files found.
libavformat/rmdec.c
View file @
95ce02b3
...
...
@@ -722,6 +722,7 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,
int
*
seq
,
int
flags
,
int64_t
timestamp
)
{
RMDemuxContext
*
rm
=
s
->
priv_data
;
int
ret
;
if
(
st
->
codecpar
->
codec_type
==
AVMEDIA_TYPE_VIDEO
)
{
rm
->
current_stream
=
st
->
id
;
...
...
@@ -778,11 +779,15 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,
}
else
return
-
1
;
}
else
{
av_get_packet
(
pb
,
pkt
,
len
);
ret
=
av_get_packet
(
pb
,
pkt
,
len
);
if
(
ret
<
0
)
return
ret
;
rm_ac3_swap_bytes
(
st
,
pkt
);
}
}
else
av_get_packet
(
pb
,
pkt
,
len
);
ret
=
av_get_packet
(
pb
,
pkt
,
len
);
if
(
ret
<
0
)
return
ret
;
pkt
->
stream_index
=
st
->
index
;
...
...
@@ -798,14 +803,18 @@ ff_rm_retrieve_cache (AVFormatContext *s, AVIOContext *pb,
AVStream
*
st
,
RMStream
*
ast
,
AVPacket
*
pkt
)
{
RMDemuxContext
*
rm
=
s
->
priv_data
;
int
ret
;
assert
(
rm
->
audio_pkt_cnt
>
0
);
if
(
ast
->
deint_id
==
DEINT_ID_VBRF
||
ast
->
deint_id
==
DEINT_ID_VBRS
)
av_get_packet
(
pb
,
pkt
,
ast
->
sub_packet_lengths
[
ast
->
sub_packet_cnt
-
rm
->
audio_pkt_cnt
]);
ast
->
deint_id
==
DEINT_ID_VBRS
)
{
ret
=
av_get_packet
(
pb
,
pkt
,
ast
->
sub_packet_lengths
[
ast
->
sub_packet_cnt
-
rm
->
audio_pkt_cnt
]);
if
(
ret
<
0
)
return
ret
;
}
else
{
int
ret
=
av_new_packet
(
pkt
,
st
->
codecpar
->
block_align
);
ret
=
av_new_packet
(
pkt
,
st
->
codecpar
->
block_align
);
if
(
ret
<
0
)
return
ret
;
memcpy
(
pkt
->
data
,
ast
->
pkt
.
data
+
st
->
codecpar
->
block_align
*
//FIXME avoid this
...
...
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