Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
ffmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Samuel Mira
ffmpeg
Commits
35ab967f
Commit
35ab967f
authored
9 years ago
by
Arnaud Bienner
Committed by
Carl Eugen Hoyos
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
lavf/mxf: Support video essence container uls for vc1.
Signed-off-by:
Carl Eugen Hoyos
<
cehoyos@ag.or.at
>
parent
fd6b38be
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavformat/mxf.c
+10
-0
10 additions, 0 deletions
libavformat/mxf.c
with
10 additions
and
0 deletions
libavformat/mxf.c
+
10
−
0
View file @
35ab967f
...
...
@@ -42,6 +42,16 @@ const MXFCodecUL ff_mxf_codec_uls[] = {
{
{
0x06
,
0x0E
,
0x2B
,
0x34
,
0x04
,
0x01
,
0x01
,
0x03
,
0x04
,
0x01
,
0x02
,
0x02
,
0x01
,
0x20
,
0x02
,
0x03
},
14
,
AV_CODEC_ID_MPEG4
},
/* XDCAM proxy_pal030926.mxf */
{
{
0x06
,
0x0E
,
0x2B
,
0x34
,
0x04
,
0x01
,
0x01
,
0x01
,
0x04
,
0x01
,
0x02
,
0x02
,
0x02
,
0x01
,
0x02
,
0x00
},
13
,
AV_CODEC_ID_DVVIDEO
},
/* DV25 IEC PAL */
{
{
0x06
,
0x0E
,
0x2B
,
0x34
,
0x04
,
0x01
,
0x01
,
0x07
,
0x04
,
0x01
,
0x02
,
0x02
,
0x03
,
0x01
,
0x01
,
0x00
},
14
,
AV_CODEC_ID_JPEG2000
},
/* JPEG2000 Codestream */
{
{
0x06
,
0x0e
,
0x2b
,
0x34
,
0x04
,
0x01
,
0x01
,
0x0A
,
0x04
,
0x01
,
0x02
,
0x02
,
0x04
,
0x01
,
0x00
,
0x00
},
14
,
AV_CODEC_ID_VC1
},
/* VC1 SP@LL */
{
{
0x06
,
0x0e
,
0x2b
,
0x34
,
0x04
,
0x01
,
0x01
,
0x0A
,
0x04
,
0x01
,
0x02
,
0x02
,
0x04
,
0x02
,
0x00
,
0x00
},
14
,
AV_CODEC_ID_VC1
},
/* VC1 SP@ML */
{
{
0x06
,
0x0e
,
0x2b
,
0x34
,
0x04
,
0x01
,
0x01
,
0x0A
,
0x04
,
0x01
,
0x02
,
0x02
,
0x04
,
0x03
,
0x00
,
0x00
},
14
,
AV_CODEC_ID_VC1
},
/* VC1 MP@LL */
{
{
0x06
,
0x0e
,
0x2b
,
0x34
,
0x04
,
0x01
,
0x01
,
0x0A
,
0x04
,
0x01
,
0x02
,
0x02
,
0x04
,
0x04
,
0x00
,
0x00
},
14
,
AV_CODEC_ID_VC1
},
/* VC1 MP@ML */
{
{
0x06
,
0x0e
,
0x2b
,
0x34
,
0x04
,
0x01
,
0x01
,
0x0A
,
0x04
,
0x01
,
0x02
,
0x02
,
0x04
,
0x05
,
0x00
,
0x00
},
14
,
AV_CODEC_ID_VC1
},
/* VC1 MP@HL */
{
{
0x06
,
0x0e
,
0x2b
,
0x34
,
0x04
,
0x01
,
0x01
,
0x0A
,
0x04
,
0x01
,
0x02
,
0x02
,
0x04
,
0x06
,
0x00
,
0x00
},
14
,
AV_CODEC_ID_VC1
},
/* VC1 AP@L0 */
{
{
0x06
,
0x0e
,
0x2b
,
0x34
,
0x04
,
0x01
,
0x01
,
0x0A
,
0x04
,
0x01
,
0x02
,
0x02
,
0x04
,
0x07
,
0x00
,
0x00
},
14
,
AV_CODEC_ID_VC1
},
/* VC1 AP@L1 */
{
{
0x06
,
0x0e
,
0x2b
,
0x34
,
0x04
,
0x01
,
0x01
,
0x0A
,
0x04
,
0x01
,
0x02
,
0x02
,
0x04
,
0x08
,
0x00
,
0x00
},
14
,
AV_CODEC_ID_VC1
},
/* VC1 AP@L2 */
{
{
0x06
,
0x0e
,
0x2b
,
0x34
,
0x04
,
0x01
,
0x01
,
0x0A
,
0x04
,
0x01
,
0x02
,
0x02
,
0x04
,
0x09
,
0x00
,
0x00
},
14
,
AV_CODEC_ID_VC1
},
/* VC1 AP@L3 */
{
{
0x06
,
0x0e
,
0x2b
,
0x34
,
0x04
,
0x01
,
0x01
,
0x0A
,
0x04
,
0x01
,
0x02
,
0x02
,
0x04
,
0x0A
,
0x00
,
0x00
},
14
,
AV_CODEC_ID_VC1
},
/* VC1 AP@L4 */
{
{
0x06
,
0x0E
,
0x2B
,
0x34
,
0x04
,
0x01
,
0x01
,
0x01
,
0x04
,
0x01
,
0x02
,
0x01
,
0x7F
,
0x00
,
0x00
,
0x00
},
13
,
AV_CODEC_ID_RAWVIDEO
},
/* Uncompressed */
{
{
0x06
,
0x0E
,
0x2B
,
0x34
,
0x04
,
0x01
,
0x01
,
0x0A
,
0x04
,
0x01
,
0x02
,
0x01
,
0x01
,
0x02
,
0x01
,
0x00
},
15
,
AV_CODEC_ID_RAWVIDEO
},
/* Uncompressed 422 8-bit */
{
{
0x06
,
0x0E
,
0x2B
,
0x34
,
0x04
,
0x01
,
0x01
,
0x01
,
0x04
,
0x01
,
0x02
,
0x02
,
0x71
,
0x00
,
0x00
,
0x00
},
13
,
AV_CODEC_ID_DNXHD
},
/* SMPTE VC-3/DNxHD */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment