Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
George Kiagiadakis
gst-plugins-base
Commits
37f91778
Commit
37f91778
authored
Sep 10, 2012
by
Tim-Philipp Müller
Browse files
video/x-3ivx -> video/mpeg, mpegversion=4
parent
9b8cbec5
Changes
3
Hide whitespace changes
Inline
Side-by-side
gst-libs/gst/pbutils/descriptions.c
View file @
37f91778
...
...
@@ -160,7 +160,6 @@ static const FormatInfo formats[] = {
/* video formats with static descriptions */
{
"video/sp5x"
,
"Sunplus JPEG 5.x"
,
0
},
{
"video/vivo"
,
"Vivo"
,
0
},
{
"video/x-3ivx"
,
"3ivx"
,
0
},
{
"video/x-4xm"
,
"4X Technologies Video"
,
0
},
{
"video/x-apple-video"
,
"Apple video"
,
0
},
{
"video/x-aasc"
,
"Autodesk Animator"
,
0
},
...
...
@@ -171,7 +170,6 @@ static const FormatInfo formats[] = {
{
"video/x-compressed-yuv"
,
N_
(
"CYUV Lossless"
),
0
},
{
"video/x-dirac"
,
"Dirac"
,
0
},
{
"video/x-dnxhd"
,
"Digital Nonlinear Extensible High Definition (DNxHD)"
,
0
},
/* FIXME 0.11: rename to subpicture/x-dvd or so */
{
"subpicture/x-dvd"
,
"DVD subpicture"
,
0
},
{
"video/x-ffv"
,
N_
(
"FFMpeg v1"
),
0
},
{
"video/x-flash-screen"
,
"Flash Screen Video"
,
0
},
...
...
gst-libs/gst/riff/riff-media.c
View file @
37f91778
...
...
@@ -449,6 +449,8 @@ gst_riff_create_video_caps (guint32 codec_fcc,
*
codec_name
=
g_strdup
(
"FFmpeg MPEG-4"
);
break
;
case
GST_MAKE_FOURCC
(
'3'
,
'I'
,
'V'
,
'1'
):
case
GST_MAKE_FOURCC
(
'3'
,
'I'
,
'V'
,
'2'
):
case
GST_MAKE_FOURCC
(
'X'
,
'V'
,
'I'
,
'D'
):
case
GST_MAKE_FOURCC
(
'x'
,
'v'
,
'i'
,
'd'
):
case
GST_MAKE_FOURCC
(
'E'
,
'M'
,
'4'
,
'A'
):
...
...
@@ -482,13 +484,6 @@ gst_riff_create_video_caps (guint32 codec_fcc,
*
codec_name
=
g_strdup
(
"Microsoft MPEG-4 4.3"
);
/* FIXME? */
break
;
case
GST_MAKE_FOURCC
(
'3'
,
'I'
,
'V'
,
'1'
):
case
GST_MAKE_FOURCC
(
'3'
,
'I'
,
'V'
,
'2'
):
caps
=
gst_caps_new_empty_simple
(
"video/x-3ivx"
);
if
(
codec_name
)
*
codec_name
=
g_strdup
(
"3ivx"
);
break
;
case
GST_MAKE_FOURCC
(
'D'
,
'V'
,
'S'
,
'D'
):
case
GST_MAKE_FOURCC
(
'd'
,
'v'
,
's'
,
'd'
):
case
GST_MAKE_FOURCC
(
'd'
,
'v'
,
'c'
,
' '
):
...
...
tests/check/libs/pbutils.c
View file @
37f91778
...
...
@@ -264,7 +264,7 @@ static const gchar *caps_strings[] = {
"audio/x-vnd.sony.atrac3"
,
"audio/x-vorbis"
,
"audio/x-voc"
,
"audio/x-w64"
,
"audio/x-wav"
,
"audio/x-wavpack"
,
"audio/x-wavpack-correction"
,
"audio/x-wms"
,
"audio/x-voxware"
,
"video/sp5x"
,
"video/vivo"
,
"video/x-3ivx"
,
"video/x-4xm"
,
"video/x-apple-video"
,
"video/x-camtasia"
,
"video/x-4xm"
,
"video/x-apple-video"
,
"video/x-camtasia"
,
"video/x-cdxa"
,
"video/x-cinepak"
,
"video/x-cirrus-logic-accupak"
,
"video/x-compressed-yuv"
,
"video/x-dirac"
,
"subpicture/x-dvd"
,
"video/x-ffv"
,
"video/x-flash-screen"
,
"video/x-flash-video"
,
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment