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
968516ce
Commit
968516ce
authored
Apr 09, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/nut: add ff_nut_audio_extra_tags to demuxer too
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
f703dae7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
nut.c
libavformat/nut.c
+2
-2
nut.h
libavformat/nut.h
+1
-0
nutdec.c
libavformat/nutdec.c
+1
-0
No files found.
libavformat/nut.c
View file @
968516ce
...
...
@@ -176,7 +176,7 @@ const AVCodecTag ff_nut_video_tags[] = {
{
AV_CODEC_ID_NONE
,
0
}
};
static
const
AVCodecTag
nut_audio_extra_tags
[]
=
{
const
AVCodecTag
ff_
nut_audio_extra_tags
[]
=
{
{
AV_CODEC_ID_PCM_ALAW
,
MKTAG
(
'A'
,
'L'
,
'A'
,
'W'
)
},
{
AV_CODEC_ID_PCM_MULAW
,
MKTAG
(
'U'
,
'L'
,
'A'
,
'W'
)
},
{
AV_CODEC_ID_MP3
,
MKTAG
(
'M'
,
'P'
,
'3'
,
' '
)
},
...
...
@@ -212,7 +212,7 @@ const AVCodecTag ff_nut_audio_tags[] = {
const
AVCodecTag
*
const
ff_nut_codec_tags
[]
=
{
ff_nut_video_tags
,
ff_nut_audio_tags
,
ff_nut_subtitle_tags
,
ff_codec_bmp_tags
,
ff_codec_wav_tags
,
nut_audio_extra_tags
,
ff_nut_data_tags
,
0
ff_codec_bmp_tags
,
ff_codec_wav_tags
,
ff_
nut_audio_extra_tags
,
ff_nut_data_tags
,
0
};
void
ff_nut_reset_ts
(
NUTContext
*
nut
,
AVRational
time_base
,
int64_t
val
)
...
...
libavformat/nut.h
View file @
968516ce
...
...
@@ -112,6 +112,7 @@ typedef struct NUTContext {
extern
const
AVCodecTag
ff_nut_subtitle_tags
[];
extern
const
AVCodecTag
ff_nut_video_tags
[];
extern
const
AVCodecTag
ff_nut_audio_tags
[];
extern
const
AVCodecTag
ff_nut_audio_extra_tags
[];
extern
const
AVCodecTag
ff_nut_data_tags
[];
extern
const
AVCodecTag
*
const
ff_nut_codec_tags
[];
...
...
libavformat/nutdec.c
View file @
968516ce
...
...
@@ -390,6 +390,7 @@ static int decode_stream_header(NUTContext *nut)
st
->
codec
->
codec_id
=
av_codec_get_id
((
const
AVCodecTag
*
const
[])
{
ff_nut_audio_tags
,
ff_codec_wav_tags
,
ff_nut_audio_extra_tags
,
0
},
tmp
);
...
...
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