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
c872d310
Commit
c872d310
authored
Oct 28, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avconv: stop accessing AVStream.parser
It is private and must not be touched from outside of lavf.
parent
8b64c2ba
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
avconv.c
avconv.c
+8
-1
avconv.h
avconv.h
+2
-0
No files found.
avconv.c
View file @
c872d310
...
...
@@ -182,6 +182,8 @@ static void avconv_cleanup(int ret)
output_streams
[
i
]
->
bitstream_filters
=
NULL
;
avcodec_free_frame
(
&
output_streams
[
i
]
->
filtered_frame
);
av_parser_close
(
output_streams
[
i
]
->
parser
);
av_freep
(
&
output_streams
[
i
]
->
forced_keyframes
);
av_freep
(
&
output_streams
[
i
]
->
avfilter
);
av_freep
(
&
output_streams
[
i
]
->
logfile_prefix
);
...
...
@@ -1013,7 +1015,10 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
&&
ost
->
st
->
codec
->
codec_id
!=
AV_CODEC_ID_MPEG2VIDEO
&&
ost
->
st
->
codec
->
codec_id
!=
AV_CODEC_ID_VC1
)
{
if
(
av_parser_change
(
ist
->
st
->
parser
,
ost
->
st
->
codec
,
&
opkt
.
data
,
&
opkt
.
size
,
pkt
->
data
,
pkt
->
size
,
pkt
->
flags
&
AV_PKT_FLAG_KEY
))
{
if
(
av_parser_change
(
ost
->
parser
,
ost
->
st
->
codec
,
&
opkt
.
data
,
&
opkt
.
size
,
pkt
->
data
,
pkt
->
size
,
pkt
->
flags
&
AV_PKT_FLAG_KEY
))
{
opkt
.
buf
=
av_buffer_create
(
opkt
.
data
,
opkt
.
size
,
av_buffer_default_free
,
NULL
,
0
);
if
(
!
opkt
.
buf
)
exit_program
(
1
);
...
...
@@ -1546,6 +1551,8 @@ static int transcode_init(void)
}
else
codec
->
time_base
=
ist
->
st
->
time_base
;
ost
->
parser
=
av_parser_init
(
codec
->
codec_id
);
switch
(
codec
->
codec_type
)
{
case
AVMEDIA_TYPE_AUDIO
:
if
(
audio_volume
!=
256
)
{
...
...
avconv.h
View file @
c872d310
...
...
@@ -305,6 +305,8 @@ typedef struct OutputStream {
int
copy_initial_nonkeyframes
;
enum
AVPixelFormat
pix_fmts
[
2
];
AVCodecParserContext
*
parser
;
}
OutputStream
;
typedef
struct
OutputFile
{
...
...
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