Commit 291bf739 authored by Christophe Massiot's avatar Christophe Massiot
Browse files

* src/input/input_dec.c: Copy block_t::i_flags to sout_buffer_t::i_flags

  (temporary).
parent b2111baf
......@@ -2,7 +2,7 @@
* stream_output.h : stream output module
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: stream_output.h,v 1.21 2004/02/22 16:08:47 fenrir Exp $
* $Id: stream_output.h,v 1.22 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;
......
......@@ -2,7 +2,7 @@
* input_dec.c: Functions for the management of decoders
*****************************************************************************
* Copyright (C) 1999-2004 VideoLAN
* $Id: input_dec.c,v 1.92 2004/02/25 18:47:02 gbazin Exp $
* $Id: input_dec.c,v 1.93 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 );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment