Commit 4c0c62a7 authored by Gildas Bazin's avatar Gildas Bazin

* configure.ac.in: fixed a few typos regarding LDFLAGS_access_*. Re-enabled
   the oss plugin as it seems to be working fine.
* src/audio_output/input.c: fixed an obscure bug... (strange one though:
   int foo = -1; unsigned int bar = 2; __MAX( foo, bar) == -1 ).
parent a5b12f13
......@@ -128,10 +128,10 @@ case "x${target_os}" in
LDFLAGS_vlc="${LDFLAGS_vlc} -lws2_32 -lnetapi32 -mwindows"
LDFLAGS_ipv4="${LDFLAGS_ipv4} -lws2_32"
LDFLAGS_ipv6="${LDFLAGS_ipv6} -lws2_32"
LDFLAGS_access_http="${LDFLAGS_http} -lws2_32"
LDFLAGS_access_mms="${LDFLAGS_mms} -lws2_32"
LDFLAGS_access_rtp="${LDFLAGS_rtp} -lws2_32"
LDFLAGS_access_udp="${LDFLAGS_udp} -lws2_32"
LDFLAGS_access_http="${LDFLAGS_access_http} -lws2_32"
LDFLAGS_access_mms="${LDFLAGS_access_mms} -lws2_32"
LDFLAGS_access_rtp="${LDFLAGS_access_rtp} -lws2_32"
LDFLAGS_access_udp="${LDFLAGS_access_udp} -lws2_32"
LDFLAGS_rc="${LDFLAGS_rc} -lws2_32"
fi
;;
......@@ -240,10 +240,10 @@ AC_CHECK_FUNC(connect,,[
AC_CHECK_FUNC(send,,[
AC_CHECK_LIB(socket,send,
LDFLAGS_http="${LDFLAGS_http} -lsocket"
LDFLAGS_mms="${LDFLAGS_mms} -lsocket"
LDFLAGS_rtp="${LDFLAGS_rtp} -lsocket"
LDFLAGS_udp="${LDFLAGS_udp} -lsocket"
LDFLAGS_access_http="${LDFLAGS_access_http} -lsocket"
LDFLAGS_access_mms="${LDFLAGS_access_mms} -lsocket"
LDFLAGS_access_rtp="${LDFLAGS_access_rtp} -lsocket"
LDFLAGS_access_udp="${LDFLAGS_access_udp} -lsocket"
)])
AC_CHECK_FUNC(gethostbyname,,[
......@@ -1755,7 +1755,7 @@ if test "x${enable_oss}" != "xno" &&
(test "x${SYS}" != "xmingw32" || test "x${enable_oss}" = "xyes")
then
AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [
#PLUGINS="${PLUGINS} oss"
PLUGINS="${PLUGINS} oss"
AC_CHECK_LIB(ossaudio,main,LDFLAGS_oss="${LDFLAGS_oss} -lossaudio")
])
fi
......
......@@ -2,7 +2,7 @@
* input.c : internal management of input streams for the audio output
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: input.c,v 1.21 2002/11/13 20:51:04 sam Exp $
* $Id: input.c,v 1.22 2002/11/15 01:23:54 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -117,9 +117,9 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
/* i_bytes_per_sec is still == -1 if no filters */
p_input->input_alloc.i_bytes_per_sec = __MAX(
p_input->input_alloc.i_bytes_per_sec,
p_input->input.i_bytes_per_frame
(int)(p_input->input.i_bytes_per_frame
* p_input->input.i_rate
/ p_input->input.i_frame_length );
/ p_input->input.i_frame_length) );
/* Allocate in the heap, it is more convenient for the decoder. */
p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP;
......
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