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
291bf739
Commit
291bf739
authored
Mar 03, 2004
by
Christophe Massiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* src/input/input_dec.c: Copy block_t::i_flags to sout_buffer_t::i_flags
(temporary).
parent
b2111baf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
include/stream_output.h
include/stream_output.h
+7
-1
src/input/input_dec.c
src/input/input_dec.c
+4
-1
No files found.
include/stream_output.h
View file @
291bf739
...
...
@@ -2,7 +2,7 @@
* stream_output.h : stream output module
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: stream_output.h,v 1.2
1 2004/02/22 16:08:47 fenrir
Exp $
* $Id: stream_output.h,v 1.2
2 2004/03/03 11:12:08 massiot
Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Laurent Aimar <fenrir@via.ecp.fr>
...
...
@@ -46,6 +46,12 @@
#define SOUT_BUFFER_FLAGS_PRIVATE_MASK 0xffff0000
#define SOUT_BUFFER_FLAGS_PRIVATE_SHIFT 16
/*
* Flags originating from block_t (FIXME: this is temporary).
*/
#define SOUT_BUFFER_FLAGS_BLOCK_MASK 0x0000ff00
#define SOUT_BUFFER_FLAGS_BLOCK_SHIFT 8
struct
sout_buffer_t
{
size_t
i_allocated_size
;
...
...
src/input/input_dec.c
View file @
291bf739
...
...
@@ -2,7 +2,7 @@
* input_dec.c: Functions for the management of decoders
*****************************************************************************
* Copyright (C) 1999-2004 VideoLAN
* $Id: input_dec.c,v 1.9
2 2004/02/25 18:47:02 gbazin
Exp $
* $Id: input_dec.c,v 1.9
3 2004/03/03 11:12:08 massiot
Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
...
...
@@ -609,6 +609,9 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
p_sout_buffer
->
i_pts
=
p_sout_block
->
i_pts
;
p_sout_buffer
->
i_dts
=
p_sout_block
->
i_dts
;
p_sout_buffer
->
i_length
=
p_sout_block
->
i_length
;
p_sout_buffer
->
i_flags
=
(
p_sout_block
->
i_flags
<<
SOUT_BUFFER_FLAGS_BLOCK_SHIFT
)
&
SOUT_BUFFER_FLAGS_BLOCK_MASK
;
block_Release
(
p_sout_block
);
...
...
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