aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJai Menon <jmenon86@gmail.com>2010-07-07 18:14:58 +0000
committerJai Menon <jmenon86@gmail.com>2010-07-07 18:14:58 +0000
commit00f72577adc7377cc28c46ebef75c18b10bc32e5 (patch)
tree664941249d00779f0c9290c9cd60e81117874fa2
parent9077e29eccd39fca766aa5b2df843dbb171ec837 (diff)
downloadffmpeg-00f72577adc7377cc28c46ebef75c18b10bc32e5.tar.gz
FFplay : Fix segfault when playing monoaural streams.
Originally committed as revision 24090 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffplay.c3
1 files changed, 2 insertions, 1 deletions
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; y<s->height; 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);