From 377c5aecf01baba11af910c37c753aa445be181b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 22 Oct 2014 17:26:18 +0200 Subject: [PATCH] Fix AIFF decoding with ffmpeg. AIFF files are little endian. ffmpeg detects this just fine, but we overwrote the endianness in the decoded format info with B_MEDIA_HOST_ENDIAN right after setting it. Now we can decode both AIFF and WAV files just fine. Fixes #7047. --- src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp index c9f141609a..f4b79b4d40 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp +++ b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp @@ -1070,8 +1070,6 @@ AVFormatReader::Stream::Init(int32 virtualIndex) format->u.raw_audio.frame_rate = (float)codecContext->sample_rate; format->u.raw_audio.channel_count = codecContext->channels; format->u.raw_audio.channel_mask = codecContext->channel_layout; - format->u.raw_audio.byte_order - = avformat_to_beos_byte_order(codecContext->sample_fmt); ConvertAVSampleFormatToRawAudioFormat(codecContext->sample_fmt, format->u.raw_audio.format); format->u.raw_audio.buffer_size = 0;