From 037d052235fe213a2a35b67343f8cbe5a0454f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Tue, 4 Aug 2009 07:21:22 +0000 Subject: [PATCH] I have no idea how that ended up there... set the decoded audio format correctly again. Should fix playback of any file where the ffmpeg plugin was responsible for sound. (The symptoms were a crash into the debugger because of an unspecified audio format...) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32107 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp index b552ac30de..e7cf59f956 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp +++ b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp @@ -334,7 +334,7 @@ AVCodecDecoder::_NegotiateAudioOutputFormat(media_format* inOutFormat) = fInputFormat.u.encoded_audio.output.frame_rate; outputAudioFormat.channel_count = fInputFormat.u.encoded_audio.output.channel_count; - outputAudioFormat.format = fInputFormat.u.encoded_audio.output.format; + outputAudioFormat.format = media_raw_audio_format::B_AUDIO_SHORT; outputAudioFormat.buffer_size = 1024 * fInputFormat.u.encoded_audio.output.channel_count; inOutFormat->type = B_MEDIA_RAW_AUDIO;