Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
f173401f
Commit
f173401f
authored
Jan 22, 2010
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
audio_format_t.i_flavor -> es_format_t.i_profile
Other (audio or video) demux/codecs than real demux can use it
parent
6a893450
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
include/vlc_es.h
include/vlc_es.h
+1
-1
modules/demux/real.c
modules/demux/real.c
+1
-1
No files found.
include/vlc_es.h
View file @
f173401f
...
@@ -93,7 +93,6 @@ struct audio_format_t
...
@@ -93,7 +93,6 @@ struct audio_format_t
unsigned
i_bitspersample
;
unsigned
i_bitspersample
;
unsigned
i_blockalign
;
unsigned
i_blockalign
;
uint8_t
i_channels
;
/* must be <=32 */
uint8_t
i_channels
;
/* must be <=32 */
uint8_t
i_flavor
;
};
};
/**
/**
...
@@ -256,6 +255,7 @@ struct es_format_t
...
@@ -256,6 +255,7 @@ struct es_format_t
subs_format_t
subs
;
/**< description of subtitle format */
subs_format_t
subs
;
/**< description of subtitle format */
unsigned
int
i_bitrate
;
/**< bitrate of this ES */
unsigned
int
i_bitrate
;
/**< bitrate of this ES */
int
i_profile
;
/**< codec specific information (like real audio flavor, mpeg audio layer, h264 profile ...) */
bool
b_packetized
;
/**< wether the data is packetized (ie. not truncated) */
bool
b_packetized
;
/**< wether the data is packetized (ie. not truncated) */
int
i_extra
;
/**< length in bytes of extra data pointer */
int
i_extra
;
/**< length in bytes of extra data pointer */
...
...
modules/demux/real.c
View file @
f173401f
...
@@ -1490,7 +1490,7 @@ static int CodecAudioParse( demux_t *p_demux, int i_tk_id, const uint8_t *p_data
...
@@ -1490,7 +1490,7 @@ static int CodecAudioParse( demux_t *p_demux, int i_tk_id, const uint8_t *p_data
case
VLC_FOURCC
(
's'
,
'i'
,
'p'
,
'r'
):
case
VLC_FOURCC
(
's'
,
'i'
,
'p'
,
'r'
):
fmt
.
i_codec
=
VLC_CODEC_SIPR
;
fmt
.
i_codec
=
VLC_CODEC_SIPR
;
fmt
.
audio
.
i_flavor
=
i_flavor
;
fmt
.
i_profile
=
i_flavor
;
if
(
i_flavor
>
3
)
if
(
i_flavor
>
3
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
...
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