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
0f26f3d5
Commit
0f26f3d5
authored
Oct 05, 2011
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
alacdec: set sample_fmt in alac_decode_init()
parent
aec83833
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
9 deletions
+10
-9
alac.c
libavcodec/alac.c
+10
-9
No files found.
libavcodec/alac.c
View file @
0f26f3d5
...
@@ -491,15 +491,6 @@ static int alac_decode_frame(AVCodecContext *avctx,
...
@@ -491,15 +491,6 @@ static int alac_decode_frame(AVCodecContext *avctx,
}
else
}
else
outputsamples
=
alac
->
setinfo_max_samples_per_frame
;
outputsamples
=
alac
->
setinfo_max_samples_per_frame
;
switch
(
alac
->
setinfo_sample_size
)
{
case
16
:
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S16
;
break
;
case
24
:
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S32
;
break
;
default
:
av_log
(
avctx
,
AV_LOG_ERROR
,
"Sample depth %d is not supported.
\n
"
,
alac
->
setinfo_sample_size
);
return
-
1
;
}
alac
->
bytespersample
=
channels
*
av_get_bytes_per_sample
(
avctx
->
sample_fmt
);
alac
->
bytespersample
=
channels
*
av_get_bytes_per_sample
(
avctx
->
sample_fmt
);
if
(
outputsamples
>
*
outputsize
/
alac
->
bytespersample
){
if
(
outputsamples
>
*
outputsize
/
alac
->
bytespersample
){
...
@@ -660,6 +651,16 @@ static av_cold int alac_decode_init(AVCodecContext * avctx)
...
@@ -660,6 +651,16 @@ static av_cold int alac_decode_init(AVCodecContext * avctx)
return
-
1
;
return
-
1
;
}
}
switch
(
alac
->
setinfo_sample_size
)
{
case
16
:
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S16
;
break
;
case
24
:
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S32
;
break
;
default
:
av_log
(
avctx
,
AV_LOG_ERROR
,
"Sample depth %d is not supported.
\n
"
,
alac
->
setinfo_sample_size
);
return
-
1
;
}
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