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
4147d8ef
Commit
4147d8ef
authored
Oct 11, 2016
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/aiffdec: Default to full rate qcelp as QT does.
Fixes decoding of the output file from ticket #4009.
parent
d0c1b982
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
aiffdec.c
libavformat/aiffdec.c
+4
-1
version.h
libavformat/version.h
+1
-1
No files found.
libavformat/aiffdec.c
View file @
4147d8ef
...
@@ -337,7 +337,10 @@ static int aiff_read_header(AVFormatContext *s)
...
@@ -337,7 +337,10 @@ static int aiff_read_header(AVFormatContext *s)
}
}
got_sound:
got_sound:
if
(
!
st
->
codecpar
->
block_align
)
{
if
(
!
st
->
codecpar
->
block_align
&&
st
->
codecpar
->
codec_id
==
AV_CODEC_ID_QCELP
)
{
av_log
(
s
,
AV_LOG_WARNING
,
"qcelp without wave chunk, assuming full rate
\n
"
);
st
->
codecpar
->
block_align
=
35
;
}
else
if
(
!
st
->
codecpar
->
block_align
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"could not find COMM tag or invalid block_align value
\n
"
);
av_log
(
s
,
AV_LOG_ERROR
,
"could not find COMM tag or invalid block_align value
\n
"
);
return
-
1
;
return
-
1
;
}
}
...
...
libavformat/version.h
View file @
4147d8ef
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 51
#define LIBAVFORMAT_VERSION_MINOR 51
#define LIBAVFORMAT_VERSION_MICRO 10
3
#define LIBAVFORMAT_VERSION_MICRO 10
4
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
LIBAVFORMAT_VERSION_MINOR, \
...
...
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