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
f7361dbc
Commit
f7361dbc
authored
Sep 04, 2015
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/mxfdec: Support more mxf files with codec_ul.
Fixes decoding for the sample from ticket #4820.
parent
f253c341
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
mxfdec.c
libavformat/mxfdec.c
+1
-6
No files found.
libavformat/mxfdec.c
View file @
f7361dbc
...
@@ -1156,11 +1156,6 @@ static const MXFCodecUL mxf_data_essence_container_uls[] = {
...
@@ -1156,11 +1156,6 @@ static const MXFCodecUL mxf_data_essence_container_uls[] = {
{
{
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
},
0
,
AV_CODEC_ID_NONE
},
{
{
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
},
0
,
AV_CODEC_ID_NONE
},
};
};
static
const
MXFCodecUL
mxf_codec_uls
[]
=
{
{
{
0x06
,
0x0E
,
0x2B
,
0x34
,
0x04
,
0x01
,
0x01
,
0x07
,
0x04
,
0x01
,
0x02
,
0x02
,
0x03
,
0x01
,
0x01
,
0x00
},
14
,
AV_CODEC_ID_JPEG2000
},
{
{
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
,
0x00
},
0
,
AV_CODEC_ID_NONE
},
};
static
const
char
*
const
mxf_data_essence_descriptor
[]
=
{
static
const
char
*
const
mxf_data_essence_descriptor
[]
=
{
"vbi_vanc_smpte_436M"
,
"vbi_vanc_smpte_436M"
,
};
};
...
@@ -1974,7 +1969,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
...
@@ -1974,7 +1969,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
codec_ul
=
mxf_get_codec_ul
(
ff_mxf_codec_uls
,
&
descriptor
->
essence_codec_ul
);
codec_ul
=
mxf_get_codec_ul
(
ff_mxf_codec_uls
,
&
descriptor
->
essence_codec_ul
);
st
->
codec
->
codec_id
=
(
enum
AVCodecID
)
codec_ul
->
id
;
st
->
codec
->
codec_id
=
(
enum
AVCodecID
)
codec_ul
->
id
;
if
(
st
->
codec
->
codec_id
==
AV_CODEC_ID_NONE
)
{
if
(
st
->
codec
->
codec_id
==
AV_CODEC_ID_NONE
)
{
codec_ul
=
mxf_get_codec_ul
(
mxf_codec_uls
,
&
descriptor
->
codec_ul
);
codec_ul
=
mxf_get_codec_ul
(
ff_
mxf_codec_uls
,
&
descriptor
->
codec_ul
);
st
->
codec
->
codec_id
=
(
enum
AVCodecID
)
codec_ul
->
id
;
st
->
codec
->
codec_id
=
(
enum
AVCodecID
)
codec_ul
->
id
;
}
}
...
...
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