Commit 5705ef28 authored by Laurent Aimar's avatar Laurent Aimar

* encoder.c: corrected required LIBAVCODEC_BUILD

 * es_out.c: ES_OUT_SET_PCR works now with microsecond.
 * configure.ac, Modules.am: enable demux2, nsv, real.
 * demux2.c: increased priority.
parent f3825420
dnl Autoconf settings for vlc
dnl $Id: configure.ac,v 1.140 2004/01/04 15:24:27 zorglub Exp $
dnl $Id: configure.ac,v 1.141 2004/01/04 15:32:13 fenrir Exp $
AC_INIT(vlc,0.7.0)
......@@ -869,7 +869,7 @@ dnl
dnl default modules
dnl
AX_ADD_PLUGINS([dummy rc logger gestures memcpy hotkeys])
AX_ADD_PLUGINS([mpgv mpga m4v mpeg_system ps ts avi asf aac mp4 rawdv])
AX_ADD_PLUGINS([mpgv mpga m4v mpeg_system ps ts avi asf aac mp4 rawdv demux2 nsv real])
AX_ADD_PLUGINS([spudec dvbsub mpeg_audio lpcm a52 dts cinepak])
AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32])
......
......@@ -2,7 +2,7 @@
* encoder.c: video and audio encoder using the ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: encoder.c,v 1.20 2003/12/14 21:03:27 gbazin Exp $
* $Id: encoder.c,v 1.21 2004/01/04 15:32:13 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -337,7 +337,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
frame.pict_type = 0;
frame.repeat_pict = p_pict->i_nb_fields;
#if LIBAVCODEC_BUILD >= 4684
#if LIBAVCODEC_BUILD >= 4685
frame.interlaced_frame = !p_pict->b_progressive;
frame.top_field_first = p_pict->b_top_field_first;
#endif
......
......@@ -11,3 +11,6 @@ SOURCES_wav = wav.c
SOURCES_aac = aac.c
SOURCES_mkv = mkv.cpp
SOURCES_livedotcom = livedotcom.cpp
SOURCES_demux2 = demux2.c
SOURCES_nsv = nsv.c
SOURCES_real = real.c
......@@ -2,7 +2,7 @@
* demux2 adaptation layer.
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id: demux2.c,v 1.1 2004/01/04 14:28:11 fenrir Exp $
* $Id: demux2.c,v 1.2 2004/01/04 15:32:13 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -37,7 +37,7 @@ static void Demux2Close ( vlc_object_t * );
vlc_module_begin();
set_description( _("demux2 adaptation layer" ) );
set_capability( "demux", 0 );
set_capability( "demux", 2 );
set_callbacks( Demux2Open, Demux2Close );
add_shortcut( "demux2" );
vlc_module_end();
......
......@@ -2,7 +2,7 @@
* es_out.c: Es Out handler for input.
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: es_out.c,v 1.11 2003/12/24 09:46:08 gbazin Exp $
* $Id: es_out.c,v 1.12 2004/01/04 15:32:13 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -658,7 +658,7 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
/* search program */
if( ( p_prgm = input_FindProgram( p_sys->p_input, i_group ) ) )
{
input_ClockManageRef( p_sys->p_input, p_prgm, i_pcr );
input_ClockManageRef( p_sys->p_input, p_prgm, i_pcr * 9 / 100);
}
p_sys->b_pcr_set = VLC_TRUE;
return VLC_SUCCESS;
......
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