Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
085676a4
Commit
085676a4
authored
Jun 10, 2006
by
Rémi Denis-Courmont
Browse files
MJPG support with DirectShow (patch from Dugal Harris)
parent
44070ee6
Changes
2
Hide whitespace changes
Inline
Side-by-side
THANKS
View file @
085676a4
...
...
@@ -51,6 +51,7 @@ Davor Orel <syntheticamac at yahoo.it> - Mac OS X icons
Dennis van Amerongen <Dennis dot vanAmerongen at nob dot nl> - x264 options unification
Diego Petteno <flameeyes at gentoo dot org> - remove usage of internal ffmpeg symbols
DirektX <direktx at freemail.hu> - Hungarian translation
Dugal Harris - DirectShow fixes and MJPEG patches
Emmanuel Blindauer <manu at agat.net> - aRts audio output
Enrico Gueli <e_gueli at yahoo.it> - Brightness threshold in adjust video filter
Espen Skoglund <esk at ira.uka.de> - FreeBSD autoconf and Makefile patches
...
...
modules/access/dshow/filter.cpp
View file @
085676a4
...
...
@@ -144,6 +144,9 @@ const GUID MEDIASUBTYPE_MPEG2_PROGRAM = {0xe06d8022, 0xdb46, 0x11cf, {0xb4, 0xd1
const
GUID
MEDIASUBTYPE_MPEG2_TRANSPORT
=
{
0xe06d8023
,
0xdb46
,
0x11cf
,
{
0xb4
,
0xd1
,
0x00
,
0x80
,
0x5f
,
0x6c
,
0xbb
,
0xea
}};
const
GUID
FORMAT_MPEG2Video
=
{
0xe06d80e3
,
0xdb46
,
0x11cf
,
{
0xb4
,
0xd1
,
0x00
,
0x80
,
0x5f
,
0x6c
,
0xbb
,
0xea
}};
/* MJPG format */
const
GUID
MEDIASUBTYPE_MJPG
=
{
0x47504A4D
,
0x0000
,
0x0010
,
{
0x80
,
0x00
,
0x00
,
0xaa
,
0x00
,
0x38
,
0x9b
,
0x71
}};
/* Analog Video */
const
GUID
FORMAT_AnalogVideo
=
{
0x482dde0
,
0x7817
,
0x11cf
,
{
0x8a
,
0x3
,
0x0
,
0xaa
,
0x0
,
0x6e
,
0xcb
,
0x65
}};
...
...
@@ -282,6 +285,11 @@ int GetFourCCFromMediaType( const AM_MEDIA_TYPE &media_type )
i_fourcc
=
VLC_FOURCC
(
'd'
,
'v'
,
's'
,
'd'
);
else
if
(
media_type
.
subtype
==
MEDIASUBTYPE_dvhd
)
i_fourcc
=
VLC_FOURCC
(
'd'
,
'v'
,
'h'
,
'd'
);
/* MJPEG format */
else
if
(
media_type
.
subtype
==
MEDIASUBTYPE_MJPG
)
i_fourcc
=
VLC_FOURCC
(
'M'
,
'J'
,
'P'
,
'G'
);
}
}
else
if
(
media_type
.
majortype
==
MEDIATYPE_Audio
)
...
...
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