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
a34dfc93
Commit
a34dfc93
authored
Oct 14, 2015
by
Hendrik Leppkes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: add deprecation guards around remaining AVFMT_RAWPICTURE usage
parent
435dfc15
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
ffmpeg.c
ffmpeg.c
+8
-1
No files found.
ffmpeg.c
View file @
a34dfc93
...
...
@@ -1099,6 +1099,7 @@ static void do_video_out(AVFormatContext *s,
#endif
return
;
#if FF_API_LAVF_FMT_RAWPICTURE
if
(
s
->
oformat
->
flags
&
AVFMT_RAWPICTURE
&&
enc
->
codec
->
id
==
AV_CODEC_ID_RAWVIDEO
)
{
/* raw pictures are written as AVPicture structure to
...
...
@@ -1114,7 +1115,9 @@ static void do_video_out(AVFormatContext *s,
pkt
.
flags
|=
AV_PKT_FLAG_KEY
;
write_frame
(
s
,
&
pkt
,
ost
);
}
else
{
}
else
#endif
{
int
got_packet
,
forced_keyframe
=
0
;
double
pts_time
;
...
...
@@ -1704,8 +1707,10 @@ static void flush_encoders(void)
if
(
enc
->
codec_type
==
AVMEDIA_TYPE_AUDIO
&&
enc
->
frame_size
<=
1
)
continue
;
#if FF_API_LAVF_FMT_RAWPICTURE
if
(
enc
->
codec_type
==
AVMEDIA_TYPE_VIDEO
&&
(
os
->
oformat
->
flags
&
AVFMT_RAWPICTURE
)
&&
enc
->
codec
->
id
==
AV_CODEC_ID_RAWVIDEO
)
continue
;
#endif
for
(;;)
{
int
(
*
encode
)(
AVCodecContext
*
,
AVPacket
*
,
const
AVFrame
*
,
int
*
)
=
NULL
;
...
...
@@ -1880,6 +1885,7 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
}
av_copy_packet_side_data
(
&
opkt
,
pkt
);
#if FF_API_LAVF_FMT_RAWPICTURE
if
(
ost
->
st
->
codec
->
codec_type
==
AVMEDIA_TYPE_VIDEO
&&
ost
->
st
->
codec
->
codec_id
==
AV_CODEC_ID_RAWVIDEO
&&
(
of
->
ctx
->
oformat
->
flags
&
AVFMT_RAWPICTURE
))
{
...
...
@@ -1894,6 +1900,7 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
opkt
.
size
=
sizeof
(
AVPicture
);
opkt
.
flags
|=
AV_PKT_FLAG_KEY
;
}
#endif
write_frame
(
of
->
ctx
,
&
opkt
,
ost
);
}
...
...
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