Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
71bd3efe
Commit
71bd3efe
authored
Dec 20, 2002
by
Sigmund Augdal Helberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed the code that was not supposed to be in my last commit
parent
8fe04320
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
29 deletions
+3
-29
modules/demux/ogg.c
modules/demux/ogg.c
+3
-29
No files found.
modules/demux/ogg.c
View file @
71bd3efe
...
...
@@ -2,7 +2,7 @@
* ogg.c : ogg stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: ogg.c,v 1.1
6
2002/12/
19 23:23:24
sigmunau Exp $
* $Id: ogg.c,v 1.1
7
2002/12/
20 15:18:56
sigmunau Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
...
...
@@ -443,8 +443,7 @@ static void Ogg_DecodePacket( input_thread_t *p_input,
if
(
p_stream
->
i_fourcc
!=
VLC_FOURCC
(
'v'
,
'o'
,
'r'
,
'b'
)
&&
p_stream
->
i_fourcc
!=
VLC_FOURCC
(
't'
,
'a'
,
'r'
,
'k'
)
&&
p_stream
->
i_fourcc
!=
VLC_FOURCC
(
't'
,
'h'
,
'e'
,
'o'
)
&&
p_stream
->
i_fourcc
!=
VLC_FOURCC
(
'o'
,
'f'
,
'l'
,
'c'
)
)
p_stream
->
i_fourcc
!=
VLC_FOURCC
(
't'
,
'h'
,
'e'
,
'o'
)
)
{
/* Remove the header from the packet */
i_header_len
=
(
*
p_oggpacket
->
packet
&
PACKET_LEN_BITS01
)
>>
6
;
...
...
@@ -525,33 +524,8 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
/* FIXME: check return value */
ogg_stream_packetpeek
(
&
p_stream
->
os
,
&
oggpacket
);
msg_Dbg
(
p_input
,
"found string: %s"
,
strndup
(
&
oggpacket
.
packet
[
0
],
6
)
);
msg_Dbg
(
p_input
,
"oggpacket.bytes is %d"
,
oggpacket
.
bytes
);
if
(
oggpacket
.
bytes
>=
4
&&
!
strncmp
(
&
oggpacket
.
packet
[
0
],
"fLaC"
,
4
)
)
{
oggpack_buffer
opb
;
msg_Dbg
(
p_input
,
"found flac header"
);
p_stream
->
i_cat
=
AUDIO_ES
;
p_stream
->
i_fourcc
=
VLC_FOURCC
(
'o'
,
'f'
,
'l'
,
'c'
);
#if 0
/* Signal that we want to keep a backup of the vorbis
* stream headers. They will be used when switching between
* audio streams. */
p_stream->b_force_backup = 1;
/* Cheat and get additionnal info ;) */
oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
oggpack_adv( &opb, 96 );
p_stream->f_rate = oggpack_read( &opb, 32 );
oggpack_adv( &opb, 32 );
p_stream->i_bitrate = oggpack_read( &opb, 32 );
#endif
}
/* Check for Vorbis header */
else
if
(
oggpacket
.
bytes
>=
7
&&
if
(
oggpacket
.
bytes
>=
7
&&
!
strncmp
(
&
oggpacket
.
packet
[
1
],
"vorbis"
,
6
)
)
{
oggpack_buffer
opb
;
...
...
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