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
30047b6a
Commit
30047b6a
authored
Dec 12, 2019
by
Yuki Tsuchiya
Committed by
James Almer
Dec 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: add MPEG-H 3D Audio codec id
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
610473b9
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
avcodec.h
libavcodec/avcodec.h
+1
-0
codec_desc.c
libavcodec/codec_desc.c
+7
-0
version.h
libavcodec/version.h
+2
-2
No files found.
libavcodec/avcodec.h
View file @
30047b6a
...
...
@@ -656,6 +656,7 @@ enum AVCodecID {
AV_CODEC_ID_ATRAC9
,
AV_CODEC_ID_HCOM
,
AV_CODEC_ID_ACELP_KELVIN
,
AV_CODEC_ID_MPEGH_3D_AUDIO
,
/* subtitle codecs */
AV_CODEC_ID_FIRST_SUBTITLE
=
0x17000
,
///< A dummy ID pointing at the start of subtitle codecs.
...
...
libavcodec/codec_desc.c
View file @
30047b6a
...
...
@@ -3016,6 +3016,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Sipro ACELP.KELVIN"
),
.
props
=
AV_CODEC_PROP_INTRA_ONLY
|
AV_CODEC_PROP_LOSSY
,
},
{
.
id
=
AV_CODEC_ID_MPEGH_3D_AUDIO
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
name
=
"mpegh_3d_audio"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-H 3D Audio"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
},
/* subtitle codecs */
{
...
...
libavcodec/version.h
View file @
30047b6a
...
...
@@ -28,8 +28,8 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 6
4
#define LIBAVCODEC_VERSION_MICRO 10
1
#define LIBAVCODEC_VERSION_MINOR 6
5
#define LIBAVCODEC_VERSION_MICRO 10
0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_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