Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
external
ffmpeg
Commits
53d5cd2c
Commit
53d5cd2c
authored
May 13, 2011
by
Carl Eugen Hoyos
Committed by
Diego Biurrun
Jun 21, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers.
parent
7ac63965
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
libavcodec/raw.c
libavcodec/raw.c
+1
-0
libavformat/isom.c
libavformat/isom.c
+4
-0
No files found.
libavcodec/raw.c
View file @
53d5cd2c
...
...
@@ -122,6 +122,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
{
PIX_FMT_UYVY422
,
MKTAG
(
'A'
,
'V'
,
'U'
,
'I'
)
},
/* FIXME merge both fields */
{
PIX_FMT_YUYV422
,
MKTAG
(
'y'
,
'u'
,
'v'
,
'2'
)
},
{
PIX_FMT_YUYV422
,
MKTAG
(
'y'
,
'u'
,
'v'
,
's'
)
},
{
PIX_FMT_YUYV422
,
MKTAG
(
'D'
,
'V'
,
'O'
,
'O'
)
},
/* Digital Voodoo SD 8 Bit */
{
PIX_FMT_PAL8
,
MKTAG
(
'W'
,
'R'
,
'A'
,
'W'
)
},
{
PIX_FMT_RGB555LE
,
MKTAG
(
'L'
,
'5'
,
'5'
,
'5'
)
},
{
PIX_FMT_RGB565LE
,
MKTAG
(
'L'
,
'5'
,
'6'
,
'5'
)
},
...
...
libavformat/isom.c
View file @
53d5cd2c
...
...
@@ -57,6 +57,7 @@ const AVCodecTag ff_mp4_obj_type[] = {
{
CODEC_ID_VC1
,
0xA3
},
{
CODEC_ID_DIRAC
,
0xA4
},
{
CODEC_ID_AC3
,
0xA5
},
{
CODEC_ID_DTS
,
0xA9
},
/* mp4ra.org */
{
CODEC_ID_VORBIS
,
0xDD
},
/* non standard, gpac uses it */
{
CODEC_ID_DVD_SUBTITLE
,
0xE0
},
/* non standard, see unsupported-embedded-subs-2.mp4 */
{
CODEC_ID_QCELP
,
0xE1
},
...
...
@@ -81,6 +82,7 @@ const AVCodecTag codec_movvideo_tags[] = {
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'A'
,
'B'
,
'G'
,
'R'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'b'
,
'1'
,
'6'
,
'g'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'b'
,
'4'
,
'8'
,
'r'
)
},
{
CODEC_ID_RAWVIDEO
,
MKTAG
(
'D'
,
'V'
,
'O'
,
'O'
)
},
/* Digital Voodoo SD 8 Bit */
{
CODEC_ID_R10K
,
MKTAG
(
'R'
,
'1'
,
'0'
,
'k'
)
},
/* UNCOMPRESSED 10BIT RGB */
{
CODEC_ID_R10K
,
MKTAG
(
'R'
,
'1'
,
'0'
,
'g'
)
},
/* UNCOMPRESSED 10BIT RGB */
...
...
@@ -243,6 +245,8 @@ const AVCodecTag codec_movaudio_tags[] = {
{
CODEC_ID_AAC
,
MKTAG
(
'm'
,
'p'
,
'4'
,
'a'
)
},
/* MPEG-4 AAC */
{
CODEC_ID_AC3
,
MKTAG
(
'a'
,
'c'
,
'-'
,
'3'
)
},
/* ETSI TS 102 366 Annex F */
{
CODEC_ID_AC3
,
MKTAG
(
's'
,
'a'
,
'c'
,
'3'
)
},
/* Nero Recode */
{
CODEC_ID_DTS
,
MKTAG
(
'd'
,
't'
,
's'
,
'c'
)
},
/* mp4ra.org */
{
CODEC_ID_DTS
,
MKTAG
(
'D'
,
'T'
,
'S'
,
' '
)
},
/* non-standard */
{
CODEC_ID_AMR_NB
,
MKTAG
(
's'
,
'a'
,
'm'
,
'r'
)
},
/* AMR-NB 3gp */
{
CODEC_ID_AMR_WB
,
MKTAG
(
's'
,
'a'
,
'w'
,
'b'
)
},
/* AMR-WB 3gp */
...
...
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