Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
b00a8eb6
Commit
b00a8eb6
authored
Jun 24, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Spell "separate"
(cherry picked from commit 19a50f5df315c583d84712be7c724ba3ab587c1c)
parent
89182ec4
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
10 deletions
+10
-10
include/vlc_osd.h
include/vlc_osd.h
+1
-1
modules/codec/dirac.c
modules/codec/dirac.c
+2
-2
modules/packetizer/h264.c
modules/packetizer/h264.c
+1
-1
modules/video_filter/atmo/DmxTools.cpp
modules/video_filter/atmo/DmxTools.cpp
+1
-1
modules/video_filter/atmo/DmxTools.h
modules/video_filter/atmo/DmxTools.h
+1
-1
modules/video_filter/atmo/README.txt
modules/video_filter/atmo/README.txt
+2
-2
modules/video_filter/atmo/atmo.cpp
modules/video_filter/atmo/atmo.cpp
+2
-2
No files found.
include/vlc_osd.h
View file @
b00a8eb6
...
@@ -363,7 +363,7 @@ struct osd_button_t
...
@@ -363,7 +363,7 @@ struct osd_button_t
*
*
* The images that make up an OSD menu can be created in such away that
* The images that make up an OSD menu can be created in such away that
* they contain all buttons in the same picture, with the selected one
* they contain all buttons in the same picture, with the selected one
* highlighted or being a concatenation of all the sep
e
rate images. The
* highlighted or being a concatenation of all the sep
a
rate images. The
* first case is the default.
* first case is the default.
*
*
* To change the default style the keyword 'style' should be set to 'concat'.
* To change the default style the keyword 'style' should be set to 'concat'.
...
...
modules/codec/dirac.c
View file @
b00a8eb6
...
@@ -103,13 +103,13 @@ static const char *const enc_chromafmt_list_text[] =
...
@@ -103,13 +103,13 @@ static const char *const enc_chromafmt_list_text[] =
#define ENC_CODINGMODE "coding-mode"
#define ENC_CODINGMODE "coding-mode"
#define ENC_CODINGMODE_TEXT N_("Picture coding mode")
#define ENC_CODINGMODE_TEXT N_("Picture coding mode")
#define ENC_CODINGMODE_LONGTEXT N_("Field coding is where interlaced fields are coded" \
#define ENC_CODINGMODE_LONGTEXT N_("Field coding is where interlaced fields are coded" \
" sep
e
rately as opposed to a pseudo-progressive frame")
" sep
a
rately as opposed to a pseudo-progressive frame")
static
const
char
*
const
enc_codingmode_list
[]
=
static
const
char
*
const
enc_codingmode_list
[]
=
{
"auto"
,
"progressive"
,
"field"
};
{
"auto"
,
"progressive"
,
"field"
};
static
const
char
*
const
enc_codingmode_list_text
[]
=
static
const
char
*
const
enc_codingmode_list_text
[]
=
{
N_
(
"auto - let encoder decide based upon input (Best)"
),
{
N_
(
"auto - let encoder decide based upon input (Best)"
),
N_
(
"force coding frame as single picture"
),
N_
(
"force coding frame as single picture"
),
N_
(
"force coding frame as sep
e
rate interlaced fields"
),
N_
(
"force coding frame as sep
a
rate interlaced fields"
),
};
};
#define ENC_MCBLK_WIDTH "mc-blk-width"
#define ENC_MCBLK_WIDTH "mc-blk-width"
...
...
modules/packetizer/h264.c
View file @
b00a8eb6
...
@@ -821,7 +821,7 @@ static void PutSPS( decoder_t *p_dec, block_t *p_frag )
...
@@ -821,7 +821,7 @@ static void PutSPS( decoder_t *p_dec, block_t *p_frag )
/* chroma_format_idc */
/* chroma_format_idc */
const
int
i_chroma_format_idc
=
bs_read_ue
(
&
s
);
const
int
i_chroma_format_idc
=
bs_read_ue
(
&
s
);
if
(
i_chroma_format_idc
==
3
)
if
(
i_chroma_format_idc
==
3
)
bs_skip
(
&
s
,
1
);
/* sep
e
rate_colour_plane_flag */
bs_skip
(
&
s
,
1
);
/* sep
a
rate_colour_plane_flag */
/* bit_depth_luma_minus8 */
/* bit_depth_luma_minus8 */
bs_read_ue
(
&
s
);
bs_read_ue
(
&
s
);
/* bit_depth_chroma_minus8 */
/* bit_depth_chroma_minus8 */
...
...
modules/video_filter/atmo/DmxTools.cpp
View file @
b00a8eb6
/*
/*
* DmxTools.cpp: functions to convert , or ; sep
erater
ed numbers into an integer array
* DmxTools.cpp: functions to convert , or ; sep
arat
ed numbers into an integer array
*
*
* See the README.txt file for copyright information and how to reach the author(s).
* See the README.txt file for copyright information and how to reach the author(s).
*
*
...
...
modules/video_filter/atmo/DmxTools.h
View file @
b00a8eb6
/*
/*
* DmxTools.h: functions to convert , or ; sep
erater
ed numbers into an integer array
* DmxTools.h: functions to convert , or ; sep
arat
ed numbers into an integer array
*
*
* See the README.txt file for copyright information and how to reach the author(s).
* See the README.txt file for copyright information and how to reach the author(s).
*
*
...
...
modules/video_filter/atmo/README.txt
View file @
b00a8eb6
...
@@ -66,7 +66,7 @@ VideonLAN 1.1.x
...
@@ -66,7 +66,7 @@ VideonLAN 1.1.x
"Serial Device / Port":
"Serial Device / Port":
The COM-Port you are using for the hardware. E.G.: COM6 (This setting must be done if you are using a device
The COM-Port you are using for the hardware. E.G.: COM6 (This setting must be done if you are using a device
other than "AtmoWin Software")
other than "AtmoWin Software")
in the case of the device "Quattro AtmoLight" you may specify up to four ports/devices sep
e
rated by
in the case of the device "Quattro AtmoLight" you may specify up to four ports/devices sep
a
rated by
, or ; for example if you are useing two physical devices write
, or ; for example if you are useing two physical devices write
COM6;COM7 or on linux /dev/ttyUSB1;/dev/ttyUSB2
COM6;COM7 or on linux /dev/ttyUSB1;/dev/ttyUSB2
...
@@ -258,7 +258,7 @@ devices that AtmoWin supports.
...
@@ -258,7 +258,7 @@ devices that AtmoWin supports.
- Quattro AtmoLight - is nothing else as that you have connected up to 4 "classic AtmoLight" devices
- Quattro AtmoLight - is nothing else as that you have connected up to 4 "classic AtmoLight" devices
to your computer creating a up 16 channel Atmo Light - each devices needs its own serial port.
to your computer creating a up 16 channel Atmo Light - each devices needs its own serial port.
you have to write the ports sep
e
rated by , or ; to [Serial Port/device] f.e. COM3,COM4,COM5 or on
you have to write the ports sep
a
rated by , or ; to [Serial Port/device] f.e. COM3,COM4,COM5 or on
Linux /dev/ttyUSB01,/dev/ttyUSB02,/dev/ttyUSB03
Linux /dev/ttyUSB01,/dev/ttyUSB02,/dev/ttyUSB03
- DMX - stands for a simple DMX controller which can control up to 255 DMX devices (lights)
- DMX - stands for a simple DMX controller which can control up to 255 DMX devices (lights)
...
...
modules/video_filter/atmo/atmo.cpp
View file @
b00a8eb6
...
@@ -164,7 +164,7 @@ static const char *const ppsz_device_type_descriptions[] = {
...
@@ -164,7 +164,7 @@ static const char *const ppsz_device_type_descriptions[] = {
"emulated with that DMX device")
"emulated with that DMX device")
#define DMX_CHBASE_TEXT N_("DMX address for each channel")
#define DMX_CHBASE_TEXT N_("DMX address for each channel")
#define DMX_CHBASE_LONGTEXT N_("Define here the DMX base address for each " \
#define DMX_CHBASE_LONGTEXT N_("Define here the DMX base address for each " \
"channel use , or ; to sep
e
rate the values")
"channel use , or ; to sep
a
rate the values")
#define MOMO_CHANNELS_TEXT N_("Count of channels")
#define MOMO_CHANNELS_TEXT N_("Count of channels")
#define MOMO_CHANNELS_LONGTEXT N_("Depending on your MoMoLight hardware " \
#define MOMO_CHANNELS_LONGTEXT N_("Depending on your MoMoLight hardware " \
...
@@ -329,7 +329,7 @@ static const char *const ppsz_zone_assignment_descriptions[] = {
...
@@ -329,7 +329,7 @@ static const char *const ppsz_zone_assignment_descriptions[] = {
#define CHANNELS_ASSIGN_TEXT N_("Channel / Zone Assignment")
#define CHANNELS_ASSIGN_TEXT N_("Channel / Zone Assignment")
#define CHANNELS_ASSIGN_LONGTEXT N_("for devices with more than five " \
#define CHANNELS_ASSIGN_LONGTEXT N_("for devices with more than five " \
"channels / zones write down here for each channel " \
"channels / zones write down here for each channel " \
"the zone number to show and sep
e
rate the values with " \
"the zone number to show and sep
a
rate the values with " \
", or ; and use -1 to not use some channels. For the " \
", or ; and use -1 to not use some channels. For the " \
"classic AtmoLight the sequence 4,3,1,0,2 would set the " \
"classic AtmoLight the sequence 4,3,1,0,2 would set the " \
"default channel/zone mapping. " \
"default channel/zone mapping. " \
...
...
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