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
0c212dbc
Commit
0c212dbc
authored
Apr 14, 2003
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* all: correctly set p_payload_end when using input_NewPacket.(But
we should perhaps change the behavour of input_NewPacket).
parent
e60df5e4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+5
-1
modules/demux/ogg.c
modules/demux/ogg.c
+2
-1
modules/demux/util/sub.c
modules/demux/util/sub.c
+2
-1
No files found.
modules/demux/mp4/mp4.c
View file @
0c212dbc
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* mp4.c : MP4 file input module for vlc
* mp4.c : MP4 file input module for vlc
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* Copyright (C) 2001 VideoLAN
* $Id: mp4.c,v 1.2
0 2003/04/06 17:48:06 gbazin
Exp $
* $Id: mp4.c,v 1.2
1 2003/04/14 03:23:30 fenrir
Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* This program is free software; you can redistribute it and/or modify
* This program is free software; you can redistribute it and/or modify
...
@@ -465,6 +465,8 @@ static int MP4Demux( input_thread_t *p_input )
...
@@ -465,6 +465,8 @@ static int MP4Demux( input_thread_t *p_input )
input_DeletePES
(
p_input
->
p_method_data
,
p_pes
);
input_DeletePES
(
p_input
->
p_method_data
,
p_pes
);
break
;
break
;
}
}
p_data
->
p_payload_end
=
p_data
->
p_payload_start
+
i_size
;
/* initialisation of all the field */
/* initialisation of all the field */
p_pes
->
i_dts
=
p_pes
->
i_pts
=
0
;
p_pes
->
i_dts
=
p_pes
->
i_pts
=
0
;
p_pes
->
p_first
=
p_pes
->
p_last
=
p_data
;
p_pes
->
p_first
=
p_pes
->
p_last
=
p_data
;
...
@@ -993,6 +995,8 @@ static int TrackCreateES ( input_thread_t *p_input,
...
@@ -993,6 +995,8 @@ static int TrackCreateES ( input_thread_t *p_input,
p_pes_init
=
input_NewPES
(
p_input
->
p_method_data
);
p_pes_init
=
input_NewPES
(
p_input
->
p_method_data
);
p_data
=
input_NewPacket
(
p_input
->
p_method_data
,
p_data
=
input_NewPacket
(
p_input
->
p_method_data
,
i_decoder_specific_info_len
);
i_decoder_specific_info_len
);
p_data
->
p_payload_end
=
p_data
->
p_payload_start
+
i_decoder_specific_info_len
;
memcpy
(
p_data
->
p_payload_start
,
memcpy
(
p_data
->
p_payload_start
,
p_decoder_specific_info
,
p_decoder_specific_info
,
i_decoder_specific_info_len
);
i_decoder_specific_info_len
);
...
...
modules/demux/ogg.c
View file @
0c212dbc
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* ogg.c : ogg stream input module for vlc
* ogg.c : ogg stream input module for vlc
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* Copyright (C) 2001 VideoLAN
* $Id: ogg.c,v 1.2
3 2003/03/31 23:37:36 sigmunau
Exp $
* $Id: ogg.c,v 1.2
4 2003/04/14 03:23:30 fenrir
Exp $
*
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
*
...
@@ -416,6 +416,7 @@ static void Ogg_DecodePacket( input_thread_t *p_input,
...
@@ -416,6 +416,7 @@ static void Ogg_DecodePacket( input_thread_t *p_input,
input_DeletePES
(
p_input
->
p_method_data
,
p_pes
);
input_DeletePES
(
p_input
->
p_method_data
,
p_pes
);
return
;
return
;
}
}
p_data
->
p_payload_end
=
p_data
->
p_payload_start
+
p_oggpacket
->
bytes
;
/* Convert the pcr into a pts */
/* Convert the pcr into a pts */
if
(
p_stream
->
i_cat
!=
SPU_ES
)
if
(
p_stream
->
i_cat
!=
SPU_ES
)
...
...
modules/demux/util/sub.c
View file @
0c212dbc
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* sub.c
* sub.c
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* Copyright (C) 1999-2001 VideoLAN
* $Id: sub.c,v 1.1
1 2003/03/30 14:24:20 gbazin
Exp $
* $Id: sub.c,v 1.1
2 2003/04/14 03:23:30 fenrir
Exp $
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
...
@@ -486,6 +486,7 @@ static int sub_demux( subtitle_demux_t *p_sub, mtime_t i_maxdate )
...
@@ -486,6 +486,7 @@ static int sub_demux( subtitle_demux_t *p_sub, mtime_t i_maxdate )
p_sub
->
i_subtitle
++
;
p_sub
->
i_subtitle
++
;
continue
;
continue
;
}
}
p_data
->
p_payload_end
=
p_data
->
p_payload_start
+
i_len
;
p_pes
->
i_pts
=
p_pes
->
i_pts
=
input_ClockGetTS
(
p_sub
->
p_input
,
input_ClockGetTS
(
p_sub
->
p_input
,
...
...
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