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
9a7f2aa9
Commit
9a7f2aa9
authored
Jan 12, 2012
by
Stefano Sabatini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpegtsenc: use more meaningful error codes
parent
b18e17ea
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
mpegtsenc.c
libavformat/mpegtsenc.c
+8
-8
No files found.
libavformat/mpegtsenc.c
View file @
9a7f2aa9
...
...
@@ -179,7 +179,7 @@ static int mpegts_write_section1(MpegTSSection *s, int tid, int id,
tot_len
=
3
+
5
+
len
+
4
;
/* check if not too big */
if
(
tot_len
>
1024
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
q
=
section
;
*
q
++
=
tid
;
...
...
@@ -651,7 +651,7 @@ static int mpegts_write_header(AVFormatContext *s)
}
av_freep
(
&
st
->
priv_data
);
}
return
-
1
;
return
AVERROR
(
EINVAL
)
;
}
/* send SDT, PAT and PMT tables regulary */
...
...
@@ -986,7 +986,7 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)
if
(
ts_st
->
first_pts_check
&&
pts
==
AV_NOPTS_VALUE
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"first pts value must set
\n
"
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
ts_st
->
first_pts_check
=
0
;
...
...
@@ -997,7 +997,7 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)
if
(
pkt
->
size
<
5
||
AV_RB32
(
pkt
->
data
)
!=
0x0000001
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"H.264 bitstream malformed, "
"no startcode found, use -vbsf h264_mp4toannexb
\n
"
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
do
{
...
...
@@ -1009,7 +1009,7 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)
if
((
state
&
0x1f
)
!=
9
)
{
// AUD NAL
data
=
av_malloc
(
pkt
->
size
+
6
);
if
(
!
data
)
return
-
1
;
return
AVERROR
(
ENOMEM
)
;
memcpy
(
data
+
6
,
pkt
->
data
,
pkt
->
size
);
AV_WB32
(
data
,
0x00000001
);
data
[
4
]
=
0x09
;
...
...
@@ -1019,18 +1019,18 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)
}
}
else
if
(
st
->
codec
->
codec_id
==
CODEC_ID_AAC
)
{
if
(
pkt
->
size
<
2
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
((
AV_RB16
(
pkt
->
data
)
&
0xfff0
)
!=
0xfff0
)
{
ADTSContext
*
adts
=
ts_st
->
adts
;
int
new_size
,
err
;
if
(
!
adts
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"aac bitstream not in adts format "
"and extradata missing
\n
"
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
new_size
=
ADTS_HEADER_SIZE
+
adts
->
pce_size
+
pkt
->
size
;
if
((
unsigned
)
new_size
>=
INT_MAX
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
data
=
av_malloc
(
new_size
);
if
(
!
data
)
return
AVERROR
(
ENOMEM
);
...
...
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