Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
39f46d49
Commit
39f46d49
authored
Feb 15, 2012
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TS demux: es_mpeg4_descriptor_t: remove write-only members
parent
3eb3203a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
19 deletions
+12
-19
modules/demux/ts.c
modules/demux/ts.c
+12
-19
No files found.
modules/demux/ts.c
View file @
39f46d49
...
@@ -193,15 +193,8 @@ typedef struct
...
@@ -193,15 +193,8 @@ typedef struct
bool
b_ok
;
bool
b_ok
;
uint16_t
i_es_id
;
uint16_t
i_es_id
;
bool
b_streamDependenceFlag
;
bool
b_OCRStreamFlag
;
uint8_t
i_streamPriority
;
char
*
psz_url
;
char
*
psz_url
;
uint16_t
i_dependOn_es_id
;
uint16_t
i_OCR_es_id
;
decoder_config_descriptor_t
dec_descr
;
decoder_config_descriptor_t
dec_descr
;
}
es_mpeg4_descriptor_t
;
}
es_mpeg4_descriptor_t
;
...
@@ -2431,17 +2424,17 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
...
@@ -2431,17 +2424,17 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
es_descr
.
i_es_id
=
IODGetWord
(
&
i_data
,
&
p_data
);
es_descr
.
i_es_id
=
IODGetWord
(
&
i_data
,
&
p_data
);
i_flags
=
IODGetByte
(
&
i_data
,
&
p_data
);
i_flags
=
IODGetByte
(
&
i_data
,
&
p_data
);
es_descr
.
b_streamDependenceFlag
=
(
i_flags
>>
7
)
&
0x01
;
bool
b_streamDependenceFlag
=
(
i_flags
>>
7
)
&
0x01
;
b_url
=
(
i_flags
>>
6
)
&
0x01
;
b_url
=
(
i_flags
>>
6
)
&
0x01
;
es_descr
.
b_OCRStreamFlag
=
(
i_flags
>>
5
)
&
0x01
;
bool
b_OCRStreamFlag
=
(
i_flags
>>
5
)
&
0x01
;
es_descr
.
i_streamPriority
=
i_flags
&
0x1f
;
uint8_t
i_streamPriority
=
i_flags
&
0x1f
;
ts_debug
(
"
\n
* * streamDependenceFlag:%d"
,
es_descr
.
b_streamDependenceFlag
);
ts_debug
(
"
\n
* * streamDependenceFlag:%d"
,
b_streamDependenceFlag
);
ts_debug
(
"
\n
* * OCRStreamFlag:%d"
,
es_descr
.
b_OCRStreamFlag
);
ts_debug
(
"
\n
* * OCRStreamFlag:%d"
,
b_OCRStreamFlag
);
ts_debug
(
"
\n
* * streamPriority:%d"
,
es_descr
.
i_streamPriority
);
ts_debug
(
"
\n
* * streamPriority:%d"
,
i_streamPriority
);
if
(
es_descr
.
b_streamDependenceFlag
)
if
(
b_streamDependenceFlag
)
{
{
es_descr
.
i_dependOn_es_id
=
IODGetWord
(
&
i_data
,
&
p_data
);
uint16_t
i_dependOn_es_id
=
IODGetWord
(
&
i_data
,
&
p_data
);
ts_debug
(
"
\n
* * dependOn_es_id:%d"
,
es_descr
.
i_dependOn_es_id
);
ts_debug
(
"
\n
* * dependOn_es_id:%d"
,
i_dependOn_es_id
);
}
}
if
(
b_url
)
if
(
b_url
)
...
@@ -2454,10 +2447,10 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
...
@@ -2454,10 +2447,10 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
es_descr
.
psz_url
=
NULL
;
es_descr
.
psz_url
=
NULL
;
}
}
if
(
es_descr
.
b_OCRStreamFlag
)
if
(
b_OCRStreamFlag
)
{
{
es_descr
.
i_OCR_es_id
=
IODGetWord
(
&
i_data
,
&
p_data
);
uint16_t
i_OCR_es_id
=
IODGetWord
(
&
i_data
,
&
p_data
);
ts_debug
(
"
\n
* * OCR_es_id:%d"
,
es_descr
.
i_OCR_es_id
);
ts_debug
(
"
\n
* * OCR_es_id:%d"
,
i_OCR_es_id
);
}
}
if
(
IODGetByte
(
&
i_data
,
&
p_data
)
!=
0x04
)
if
(
IODGetByte
(
&
i_data
,
&
p_data
)
!=
0x04
)
...
...
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