Commit b3674200 authored by gbazin's avatar gbazin
Browse files

* modules/codec/ffmpeg/postprocess.c: fixed uninitialized variable.
* modules/mux/ogg.c: allow embedding mpeg1/2 video (only vlc will play back these files).
parent 07afa46c
......@@ -2,7 +2,7 @@
* postprocess.c: video postprocessing using the ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: postprocess.c,v 1.4 2003/11/23 20:37:04 gbazin Exp $
* $Id: postprocess.c,v 1.5 2003/11/24 00:01:42 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -71,6 +71,7 @@ void *E_(OpenPostproc)( decoder_t *p_dec, vlc_bool_t *pb_pp )
p_sys = malloc( sizeof(video_postproc_sys_t) );
p_sys->pp_context = NULL;
p_sys->pp_mode = NULL;
*pb_pp = VLC_FALSE;
p_sys->pb_pp = pb_pp;
......
......@@ -2,7 +2,7 @@
* ogg.c: ogg muxer module for vlc
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: ogg.c,v 1.22 2003/11/21 20:49:14 gbazin Exp $
* $Id: ogg.c,v 1.23 2003/11/24 00:01:42 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -352,6 +352,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
case VIDEO_ES:
switch( p_stream->i_fourcc )
{
case VLC_FOURCC( 'm', 'p','g', 'v' ):
case VLC_FOURCC( 'm', 'p','4', 'v' ):
case VLC_FOURCC( 'D', 'I','V', '3' ):
memcpy( p_stream->oggds_header.stream_type, "video", 5 );
......@@ -363,6 +364,10 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
{
memcpy( p_stream->oggds_header.sub_type, "DIV3", 4 );
}
else
{
memcpy(p_stream->oggds_header.sub_type,&p_stream->i_fourcc,4);
}
SetDWLE( &p_stream->oggds_header.i_size,
sizeof( oggds_header_t ) - 1);
SetQWLE( &p_stream->oggds_header.i_time_unit,
......
Supports Markdown
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