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
e5419709
Commit
e5419709
authored
Nov 09, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: remove the extended_data workarounds.
All decoders should now handle it properly.
parent
d351ef47
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
12 deletions
+0
-12
utils.c
libavcodec/utils.c
+0
-12
No files found.
libavcodec/utils.c
View file @
e5419709
...
...
@@ -1431,10 +1431,6 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
}
else
ret
=
0
;
/* many decoders assign whole AVFrames, thus overwriting extended_data;
* make sure it's set correctly */
picture
->
extended_data
=
picture
->
data
;
return
ret
;
}
...
...
@@ -1444,7 +1440,6 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
AVPacket
*
avpkt
)
{
AVCodecInternal
*
avci
=
avctx
->
internal
;
int
planar
,
channels
;
int
ret
=
0
;
*
got_frame_ptr
=
0
;
...
...
@@ -1487,13 +1482,6 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
av_frame_unref
(
frame
);
}
/* many decoders assign whole AVFrames, thus overwriting extended_data;
* make sure it's set correctly; assume decoders that actually use
* extended_data are doing it correctly */
planar
=
av_sample_fmt_is_planar
(
frame
->
format
);
channels
=
av_get_channel_layout_nb_channels
(
frame
->
channel_layout
);
if
(
!
(
planar
&&
channels
>
AV_NUM_DATA_POINTERS
))
frame
->
extended_data
=
frame
->
data
;
return
ret
;
}
...
...
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