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
1d5edad8
Commit
1d5edad8
authored
Jul 07, 2015
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/mpegtsenc: Only fail aac muxing if the first frame is invalid.
Fixes ticket #3957.
parent
d44cf5ef
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
mpegtsenc.c
libavformat/mpegtsenc.c
+4
-3
No files found.
libavformat/mpegtsenc.c
View file @
1d5edad8
...
@@ -1313,9 +1313,9 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
...
@@ -1313,9 +1313,9 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
if
(
!
ts_st
->
amux
)
{
if
(
!
ts_st
->
amux
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"AAC bitstream not in ADTS format "
av_log
(
s
,
AV_LOG_ERROR
,
"AAC bitstream not in ADTS format "
"and extradata missing
\n
"
);
"and extradata missing
\n
"
);
return
AVERROR_INVALIDDATA
;
if
(
!
st
->
nb_frames
)
}
return
AVERROR_INVALIDDATA
;
}
else
{
av_init_packet
(
&
pkt2
);
av_init_packet
(
&
pkt2
);
pkt2
.
data
=
pkt
->
data
;
pkt2
.
data
=
pkt
->
data
;
pkt2
.
size
=
pkt
->
size
;
pkt2
.
size
=
pkt
->
size
;
...
@@ -1334,6 +1334,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
...
@@ -1334,6 +1334,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
size
=
avio_close_dyn_buf
(
ts_st
->
amux
->
pb
,
&
data
);
size
=
avio_close_dyn_buf
(
ts_st
->
amux
->
pb
,
&
data
);
ts_st
->
amux
->
pb
=
NULL
;
ts_st
->
amux
->
pb
=
NULL
;
buf
=
data
;
buf
=
data
;
}
}
}
}
else
if
(
st
->
codec
->
codec_id
==
AV_CODEC_ID_HEVC
)
{
}
else
if
(
st
->
codec
->
codec_id
==
AV_CODEC_ID_HEVC
)
{
int
ret
=
check_hevc_startcode
(
s
,
st
,
pkt
);
int
ret
=
check_hevc_startcode
(
s
,
st
,
pkt
);
...
...
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