Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
75f3e5e0
Commit
75f3e5e0
authored
Jan 31, 2016
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avdevice/lavfi: replace deprecated avpicture_layout
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
0a7379d9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
6 deletions
+2
-6
lavfi.c
libavdevice/lavfi.c
+2
-6
No files found.
libavdevice/lavfi.c
View file @
75f3e5e0
...
...
@@ -382,7 +382,6 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt)
double
min_pts
=
DBL_MAX
;
int
stream_idx
,
min_pts_sink_idx
=
0
;
AVFrame
*
frame
=
lavfi
->
decoded_frame
;
AVPicture
pict
;
AVDictionary
*
frame_metadata
;
int
ret
,
i
;
int
size
=
0
;
...
...
@@ -435,11 +434,8 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt)
if
((
ret
=
av_new_packet
(
pkt
,
size
))
<
0
)
return
ret
;
memcpy
(
pict
.
data
,
frame
->
data
,
4
*
sizeof
(
frame
->
data
[
0
]));
memcpy
(
pict
.
linesize
,
frame
->
linesize
,
4
*
sizeof
(
frame
->
linesize
[
0
]));
avpicture_layout
(
&
pict
,
frame
->
format
,
frame
->
width
,
frame
->
height
,
pkt
->
data
,
size
);
av_image_copy_to_buffer
(
pkt
->
data
,
size
,
(
const
uint8_t
**
)
frame
->
data
,
frame
->
linesize
,
frame
->
format
,
frame
->
width
,
frame
->
height
,
1
);
}
else
if
(
av_frame_get_channels
(
frame
)
/* FIXME test audio */
)
{
size
=
frame
->
nb_samples
*
av_get_bytes_per_sample
(
frame
->
format
)
*
av_frame_get_channels
(
frame
);
...
...
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