Skip to content

V
vlc-2-2
Commit 94cc398e authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

all: fix some minors warnings.

parent 64310cf3
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
modules/codec/ffmpeg/audio.c
View file @ 94cc398e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* audio.c: audio decoder using ffmpeg library * audio.c: audio decoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: audio.c,v 1.6 2002/12/02 21:13:25 jlj Exp $ * $Id: audio.c,v 1.7 2002/12/06 14:22:55 fenrir Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -58,7 +58,7 @@ int E_( InitThread_Audio ) ( adec_thread_t * ); ...@@ -58,7 +58,7 @@ int E_( InitThread_Audio ) ( adec_thread_t * );
void E_( EndThread_Audio ) ( adec_thread_t * ); void E_( EndThread_Audio ) ( adec_thread_t * );
void E_( DecodeThread_Audio ) ( adec_thread_t * ); void E_( DecodeThread_Audio ) ( adec_thread_t * );
static int pi_channels_maps[6] = static unsigned int pi_channels_maps[6] =
{ {
0, 0,
AOUT_CHAN_CENTER, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
......
modules/codec/ffmpeg/video.c
View file @ 94cc398e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* video.c: video decoder using ffmpeg library * video.c: video decoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: video.c,v 1.9 2002/12/06 11:53:45 fenrir Exp $ * $Id: video.c,v 1.10 2002/12/06 14:22:55 fenrir Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com> * Gildas Bazin <gbazin@netcourrier.com>
...@@ -95,9 +95,9 @@ static vout_thread_t *ffmpeg_CreateVout( vdec_thread_t *p_vdec, ...@@ -95,9 +95,9 @@ static vout_thread_t *ffmpeg_CreateVout( vdec_thread_t *p_vdec,
AVCodecContext *p_context ) AVCodecContext *p_context )
{ {
vout_thread_t *p_vout; vout_thread_t *p_vout;
int i_width = p_vdec->p_context->width; int i_width = p_context->width;
int i_height = p_vdec->p_context->height; int i_height =p_context->height;
uint32_t i_chroma = ffmpeg_PixFmtToChroma( p_vdec->p_context->pix_fmt ); uint32_t i_chroma = ffmpeg_PixFmtToChroma( p_context->pix_fmt );
int i_aspect; int i_aspect;
if( !i_width || !i_height ) if( !i_width || !i_height )
...@@ -115,12 +115,12 @@ static vout_thread_t *ffmpeg_CreateVout( vdec_thread_t *p_vdec, ...@@ -115,12 +115,12 @@ static vout_thread_t *ffmpeg_CreateVout( vdec_thread_t *p_vdec,
} }
#if LIBAVCODEC_BUILD >= 4640 #if LIBAVCODEC_BUILD >= 4640
if( ( i_aspect = (int) ( VOUT_ASPECT_FACTOR * if( ( i_aspect = (int) ( VOUT_ASPECT_FACTOR *
p_vdec->p_context->aspect_ratio ) ) == 0 ) p_context->aspect_ratio ) ) == 0 )
{ {
i_aspect = VOUT_ASPECT_FACTOR * i_width / i_height; i_aspect = VOUT_ASPECT_FACTOR * i_width / i_height;
} }
#else #else
switch( p_vdec->p_context->aspect_ratio_info ) switch( p_context->aspect_ratio_info )
{ {
case( FF_ASPECT_4_3_625 ): case( FF_ASPECT_4_3_625 ):
case( FF_ASPECT_4_3_525 ): case( FF_ASPECT_4_3_525 ):
......
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