On Sat, May 21, 2011 at 11:34:40 (CEST), Vitor Sessak wrote:
> On 05/21/2011 10:33 AM, Reinhard Tartler wrote:
>> On Tue, May 17, 2011 at 22:28:28 (CEST), Vitor Sessak wrote:
>>
>>> diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
>>> index 3422b6d..a9331cb 100644
>>> --- a/libavcodec/mpegaudio.h
>>> +++ b/libavcodec/mpegaudio.h
>>> @@ -130,9 +130,9 @@ typedef struct MPADecodeContext {
>>> uint32_t free_format_next_header;
>>> GetBitContext gb;
>>> GetBitContext in_gb;
>>> - DECLARE_ALIGNED(16, MPA_INT, synth_buf)[MPA_MAX_CHANNELS][512 * 2];
>>> + DECLARE_ALIGNED(32, MPA_INT, synth_buf)[MPA_MAX_CHANNELS][512 * 2];
>>> int synth_buf_offset[MPA_MAX_CHANNELS];
>>> - DECLARE_ALIGNED(16, INTFLOAT,
>>> sb_samples)[MPA_MAX_CHANNELS][36][SBLIMIT];
>>> + DECLARE_ALIGNED(32, INTFLOAT,
>>> sb_samples)[MPA_MAX_CHANNELS][36][SBLIMIT];
>>> INTFLOAT mdct_buf[MPA_MAX_CHANNELS][SBLIMIT * 18]; /* previous
>>> samples, for layer 3 MDCT */
>>> GranuleDef granules[2][2]; /* Used in Layer 3 */
>>> #ifdef DEBUG
>>
>> I have moved this locally to libavcodec/mpc.h, I hope this isn't what
>> has caused the segfault.
>
> Indeed it is a merge problem. This chunk should be now at
> mpegaudiodec.c. A version of the third patch that applies cleanly is
> attached.
Indeed, this version now passes all tests and FATE tests with AVX.
Also, if I didn't miss anything, all comments were incorporated. Unless
somebody objects until tonight, I'll push this to master.
Thanks for your excellent work!
--
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
