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
c11157c0
Unverified
Commit
c11157c0
authored
Apr 08, 2016
by
Rodger Combs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/audiotoolboxdec: only send extradata for formats that use it
Fixes initialization errors for some AVI files
parent
acd5910e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
3 deletions
+10
-3
audiotoolboxdec.c
libavcodec/audiotoolboxdec.c
+10
-3
No files found.
libavcodec/audiotoolboxdec.c
View file @
c11157c0
...
@@ -261,10 +261,17 @@ static uint8_t* ffat_get_magic_cookie(AVCodecContext *avctx, UInt32 *cookie_size
...
@@ -261,10 +261,17 @@ static uint8_t* ffat_get_magic_cookie(AVCodecContext *avctx, UInt32 *cookie_size
}
}
}
}
static
av_cold
int
ffat_usable_extradata
(
AVCodecContext
*
avctx
)
{
return
avctx
->
extradata_size
&&
(
avctx
->
codec_id
==
AV_CODEC_ID_ALAC
||
avctx
->
codec_id
==
AV_CODEC_ID_AAC
);
}
static
int
ffat_set_extradata
(
AVCodecContext
*
avctx
)
static
int
ffat_set_extradata
(
AVCodecContext
*
avctx
)
{
{
ATDecodeContext
*
at
=
avctx
->
priv_data
;
ATDecodeContext
*
at
=
avctx
->
priv_data
;
if
(
avctx
->
extradata_size
)
{
if
(
ffat_usable_extradata
(
avctx
)
)
{
OSStatus
status
;
OSStatus
status
;
UInt32
cookie_size
;
UInt32
cookie_size
;
uint8_t
*
cookie
=
ffat_get_magic_cookie
(
avctx
,
&
cookie_size
);
uint8_t
*
cookie
=
ffat_get_magic_cookie
(
avctx
,
&
cookie_size
);
...
@@ -305,7 +312,7 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, AVPacket *pkt)
...
@@ -305,7 +312,7 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, AVPacket *pkt)
avctx
->
sample_fmt
=
sample_fmt
;
avctx
->
sample_fmt
=
sample_fmt
;
if
(
avctx
->
extradata
)
{
if
(
ffat_usable_extradata
(
avctx
)
)
{
UInt32
format_size
=
sizeof
(
in_format
);
UInt32
format_size
=
sizeof
(
in_format
);
UInt32
cookie_size
;
UInt32
cookie_size
;
uint8_t
*
cookie
=
ffat_get_magic_cookie
(
avctx
,
&
cookie_size
);
uint8_t
*
cookie
=
ffat_get_magic_cookie
(
avctx
,
&
cookie_size
);
...
@@ -384,7 +391,7 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, AVPacket *pkt)
...
@@ -384,7 +391,7 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, AVPacket *pkt)
static
av_cold
int
ffat_init_decoder
(
AVCodecContext
*
avctx
)
static
av_cold
int
ffat_init_decoder
(
AVCodecContext
*
avctx
)
{
{
if
((
avctx
->
channels
&&
avctx
->
sample_rate
)
||
avctx
->
extradata_size
)
if
((
avctx
->
channels
&&
avctx
->
sample_rate
)
||
ffat_usable_extradata
(
avctx
)
)
return
ffat_create_decoder
(
avctx
,
NULL
);
return
ffat_create_decoder
(
avctx
,
NULL
);
else
else
return
0
;
return
0
;
...
...
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