From 00f72577adc7377cc28c46ebef75c18b10bc32e5 Mon Sep 17 00:00:00 2001 From: Jai Menon Date: Wed, 7 Jul 2010 18:14:58 +0000 Subject: FFplay : Fix segfault when playing monoaural streams. Originally committed as revision 24090 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffplay.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ffplay.c') diff --git a/ffplay.c b/ffplay.c index 67e2437253..c32b10a5a1 100644 --- a/ffplay.c +++ b/ffplay.c @@ -943,7 +943,8 @@ static void video_audio_display(VideoState *s) for(y=0; yheight; y++){ double w= 1/sqrt(nb_freq); int a= sqrt(w*sqrt(data[0][2*y+0]*data[0][2*y+0] + data[0][2*y+1]*data[0][2*y+1])); - int b= sqrt(w*sqrt(data[1][2*y+0]*data[1][2*y+0] + data[1][2*y+1]*data[1][2*y+1])); + int b= (nb_display_channels == 2 ) ? sqrt(w*sqrt(data[1][2*y+0]*data[1][2*y+0] + + data[1][2*y+1]*data[1][2*y+1])) : a; a= FFMIN(a,255); b= FFMIN(b,255); fgcolor = SDL_MapRGB(screen->format, a, b, (a+b)/2); -- cgit v1.2.3