ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/vorbis_data.c

 /*
  * copyright (c) 2005 Denes Balatoni ( dbalatoni programozo hu )
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
@@ skipping 26 matching lines @@
     CH_LAYOUT_STEREO,
     CH_LAYOUT_SURROUND,
     CH_LAYOUT_QUAD,
     CH_LAYOUT_5POINT0_BACK,
     CH_LAYOUT_5POINT1_BACK,
     CH_LAYOUT_5POINT1|CH_BACK_CENTER,
     CH_LAYOUT_7POINT1,
     0
 };
 
-DECLARE_ALIGNED_16(static const float, vwin64)[32] = {
+DECLARE_ALIGNED(16, static const float, vwin64)[32] = {
     0.0009460463F, 0.0085006468F, 0.0235352254F, 0.0458950567F,
     0.0753351908F, 0.1115073077F, 0.1539457973F, 0.2020557475F,
     0.2551056759F, 0.3122276645F, 0.3724270287F, 0.4346027792F,
     0.4975789974F, 0.5601459521F, 0.6211085051F, 0.6793382689F,
     0.7338252629F, 0.7837245849F, 0.8283939355F, 0.8674186656F,
     0.9006222429F, 0.9280614787F, 0.9500073081F, 0.9669131782F,
     0.9793740220F, 0.9880792941F, 0.9937636139F, 0.9971582668F,
     0.9989462667F, 0.9997230082F, 0.9999638688F, 0.9999995525F,
 };
 
-DECLARE_ALIGNED_16(static const float, vwin128)[64] = {
+DECLARE_ALIGNED(16, static const float, vwin128)[64] = {
     0.0002365472F, 0.0021280687F, 0.0059065254F, 0.0115626550F,
     0.0190823442F, 0.0284463735F, 0.0396300935F, 0.0526030430F,
     0.0673285281F, 0.0837631763F, 0.1018564887F, 0.1215504095F,
     0.1427789367F, 0.1654677960F, 0.1895342001F, 0.2148867160F,
     0.2414252576F, 0.2690412240F, 0.2976177952F, 0.3270303960F,
     0.3571473350F, 0.3878306189F, 0.4189369387F, 0.4503188188F,
     0.4818259135F, 0.5133064334F, 0.5446086751F, 0.5755826278F,
     0.6060816248F, 0.6359640047F, 0.6650947483F, 0.6933470543F,
     0.7206038179F, 0.7467589810F, 0.7717187213F, 0.7954024542F,
     0.8177436264F, 0.8386902831F, 0.8582053981F, 0.8762669622F,
     0.8928678298F, 0.9080153310F, 0.9217306608F, 0.9340480615F,
     0.9450138200F, 0.9546851041F, 0.9631286621F, 0.9704194171F,
     0.9766389810F, 0.9818741197F, 0.9862151938F, 0.9897546035F,
     0.9925852598F, 0.9947991032F, 0.9964856900F, 0.9977308602F,
     0.9986155015F, 0.9992144193F, 0.9995953200F, 0.9998179155F,
     0.9999331503F, 0.9999825563F, 0.9999977357F, 0.9999999720F,
 };
 
-DECLARE_ALIGNED_16(static const float, vwin256)[128] = {
+DECLARE_ALIGNED(16, static const float, vwin256)[128] = {
     0.0000591390F, 0.0005321979F, 0.0014780301F, 0.0028960636F,
     0.0047854363F, 0.0071449926F, 0.0099732775F, 0.0132685298F,
     0.0170286741F, 0.0212513119F, 0.0259337111F, 0.0310727950F,
     0.0366651302F, 0.0427069140F, 0.0491939614F, 0.0561216907F,
     0.0634851102F, 0.0712788035F, 0.0794969160F, 0.0881331402F,
     0.0971807028F, 0.1066323515F, 0.1164803426F, 0.1267164297F,
     0.1373318534F, 0.1483173323F, 0.1596630553F, 0.1713586755F,
     0.1833933062F, 0.1957555184F, 0.2084333404F, 0.2214142599F,
     0.2346852280F, 0.2482326664F, 0.2620424757F, 0.2761000481F,
     0.2903902813F, 0.3048975959F, 0.3196059553F, 0.3344988887F,
@@ skipping 14 matching lines @@
     0.9751798427F, 0.9780365753F, 0.9806527301F, 0.9830396204F,
     0.9852087111F, 0.9871715701F, 0.9889398207F, 0.9905250941F,
     0.9919389832F, 0.9931929973F, 0.9942985174F, 0.9952667537F,
     0.9961087037F, 0.9968351119F, 0.9974564312F, 0.9979827858F,
     0.9984239359F, 0.9987892441F, 0.9990876435F, 0.9993276081F,
     0.9995171241F, 0.9996636648F, 0.9997741654F, 0.9998550016F,
     0.9999119692F, 0.9999502656F, 0.9999744742F, 0.9999885497F,
     0.9999958064F, 0.9999989077F, 0.9999998584F, 0.9999999983F,
 };
 
-DECLARE_ALIGNED_16(static const float, vwin512)[256] = {
+DECLARE_ALIGNED(16, static const float, vwin512)[256] = {
     0.0000147849F, 0.0001330607F, 0.0003695946F, 0.0007243509F,
     0.0011972759F, 0.0017882983F, 0.0024973285F, 0.0033242588F,
     0.0042689632F, 0.0053312973F, 0.0065110982F, 0.0078081841F,
     0.0092223540F, 0.0107533880F, 0.0124010466F, 0.0141650703F,
     0.0160451800F, 0.0180410758F, 0.0201524373F, 0.0223789233F,
     0.0247201710F, 0.0271757958F, 0.0297453914F, 0.0324285286F,
     0.0352247556F, 0.0381335972F, 0.0411545545F, 0.0442871045F,
     0.0475306997F, 0.0508847676F, 0.0543487103F, 0.0579219038F,
     0.0616036982F, 0.0653934164F, 0.0692903546F, 0.0732937809F,
     0.0774029356F, 0.0816170305F, 0.0859352485F, 0.0903567428F,
@@ skipping 46 matching lines @@
     0.9983211172F, 0.9985220166F, 0.9987045311F, 0.9988697776F,
     0.9990188449F, 0.9991527924F, 0.9992726499F, 0.9993794157F,
     0.9994740570F, 0.9995575079F, 0.9996306699F, 0.9996944099F,
     0.9997495605F, 0.9997969190F, 0.9998372465F, 0.9998712678F,
     0.9998996704F, 0.9999231041F, 0.9999421807F, 0.9999574732F,
     0.9999695157F, 0.9999788026F, 0.9999857885F, 0.9999908879F,
     0.9999944746F, 0.9999968817F, 0.9999984010F, 0.9999992833F,
     0.9999997377F, 0.9999999317F, 0.9999999911F, 0.9999999999F,
 };
 
-DECLARE_ALIGNED_16(static const float, vwin1024)[512] = {
+DECLARE_ALIGNED(16, static const float, vwin1024)[512] = {
     0.0000036962F, 0.0000332659F, 0.0000924041F, 0.0001811086F,
     0.0002993761F, 0.0004472021F, 0.0006245811F, 0.0008315063F,
     0.0010679699F, 0.0013339631F, 0.0016294757F, 0.0019544965F,
     0.0023090133F, 0.0026930125F, 0.0031064797F, 0.0035493989F,
     0.0040217533F, 0.0045235250F, 0.0050546946F, 0.0056152418F,
     0.0062051451F, 0.0068243817F, 0.0074729278F, 0.0081507582F,
     0.0088578466F, 0.0095941655F, 0.0103596863F, 0.0111543789F,
     0.0119782122F, 0.0128311538F, 0.0137131701F, 0.0146242260F,
     0.0155642855F, 0.0165333111F, 0.0175312640F, 0.0185581042F,
     0.0196137903F, 0.0206982797F, 0.0218115284F, 0.0229534910F,
@@ skipping 110 matching lines @@
     0.9998930603F, 0.9999059701F, 0.9999176774F, 0.9999282586F,
     0.9999377880F, 0.9999463370F, 0.9999539749F, 0.9999607685F,
     0.9999667820F, 0.9999720773F, 0.9999767136F, 0.9999807479F,
     0.9999842344F, 0.9999872249F, 0.9999897688F, 0.9999919127F,
     0.9999937009F, 0.9999951749F, 0.9999963738F, 0.9999973342F,
     0.9999980900F, 0.9999986724F, 0.9999991103F, 0.9999994297F,
     0.9999996543F, 0.9999998049F, 0.9999999000F, 0.9999999552F,
     0.9999999836F, 0.9999999957F, 0.9999999994F, 1.0000000000F,
 };
 
-DECLARE_ALIGNED_16(static const float, vwin2048)[1024] = {
+DECLARE_ALIGNED(16, static const float, vwin2048)[1024] = {
     0.0000009241F, 0.0000083165F, 0.0000231014F, 0.0000452785F,
     0.0000748476F, 0.0001118085F, 0.0001561608F, 0.0002079041F,
     0.0002670379F, 0.0003335617F, 0.0004074748F, 0.0004887765F,
     0.0005774661F, 0.0006735427F, 0.0007770054F, 0.0008878533F,
     0.0010060853F, 0.0011317002F, 0.0012646969F, 0.0014050742F,
     0.0015528307F, 0.0017079650F, 0.0018704756F, 0.0020403610F,
     0.0022176196F, 0.0024022497F, 0.0025942495F, 0.0027936173F,
     0.0030003511F, 0.0032144490F, 0.0034359088F, 0.0036647286F,
     0.0039009061F, 0.0041444391F, 0.0043953253F, 0.0046535621F,
     0.0049191472F, 0.0051920781F, 0.0054723520F, 0.0057599664F,
@@ skipping 238 matching lines @@
     0.9999932849F, 0.9999940972F, 0.9999948336F, 0.9999954989F,
     0.9999960978F, 0.9999966349F, 0.9999971146F, 0.9999975411F,
     0.9999979185F, 0.9999982507F, 0.9999985414F, 0.9999987944F,
     0.9999990129F, 0.9999992003F, 0.9999993596F, 0.9999994939F,
     0.9999996059F, 0.9999996981F, 0.9999997732F, 0.9999998333F,
     0.9999998805F, 0.9999999170F, 0.9999999444F, 0.9999999643F,
     0.9999999784F, 0.9999999878F, 0.9999999937F, 0.9999999972F,
     0.9999999990F, 0.9999999997F, 1.0000000000F, 1.0000000000F,
 };
 
-DECLARE_ALIGNED_16(static const float, vwin4096)[2048] = {
+DECLARE_ALIGNED(16, static const float, vwin4096)[2048] = {
     0.0000002310F, 0.0000020791F, 0.0000057754F, 0.0000113197F,
     0.0000187121F, 0.0000279526F, 0.0000390412F, 0.0000519777F,
     0.0000667623F, 0.0000833949F, 0.0001018753F, 0.0001222036F,
     0.0001443798F, 0.0001684037F, 0.0001942754F, 0.0002219947F,
     0.0002515616F, 0.0002829761F, 0.0003162380F, 0.0003513472F,
     0.0003883038F, 0.0004271076F, 0.0004677584F, 0.0005102563F,
     0.0005546011F, 0.0006007928F, 0.0006488311F, 0.0006987160F,
     0.0007504474F, 0.0008040251F, 0.0008594490F, 0.0009167191F,
     0.0009758351F, 0.0010367969F, 0.0010996044F, 0.0011642574F,
     0.0012307558F, 0.0012990994F, 0.0013692880F, 0.0014413216F,
@@ skipping 494 matching lines @@
     0.9999995798F, 0.9999996307F, 0.9999996768F, 0.9999997184F,
     0.9999997559F, 0.9999997895F, 0.9999998195F, 0.9999998462F,
     0.9999998698F, 0.9999998906F, 0.9999999088F, 0.9999999246F,
     0.9999999383F, 0.9999999500F, 0.9999999600F, 0.9999999684F,
     0.9999999754F, 0.9999999811F, 0.9999999858F, 0.9999999896F,
     0.9999999925F, 0.9999999948F, 0.9999999965F, 0.9999999978F,
     0.9999999986F, 0.9999999992F, 0.9999999996F, 0.9999999998F,
     0.9999999999F, 1.0000000000F, 1.0000000000F, 1.0000000000F,
 };
 
-DECLARE_ALIGNED_16(static const float, vwin8192)[4096] = {
+DECLARE_ALIGNED(16, static const float, vwin8192)[4096] = {
     0.0000000578F, 0.0000005198F, 0.0000014438F, 0.0000028299F,
     0.0000046780F, 0.0000069882F, 0.0000097604F, 0.0000129945F,
     0.0000166908F, 0.0000208490F, 0.0000254692F, 0.0000305515F,
     0.0000360958F, 0.0000421021F, 0.0000485704F, 0.0000555006F,
     0.0000628929F, 0.0000707472F, 0.0000790635F, 0.0000878417F,
     0.0000970820F, 0.0001067842F, 0.0001169483F, 0.0001275744F,
     0.0001386625F, 0.0001502126F, 0.0001622245F, 0.0001746984F,
     0.0001876343F, 0.0002010320F, 0.0002148917F, 0.0002292132F,
     0.0002439967F, 0.0002592421F, 0.0002749493F, 0.0002911184F,
     0.0003077493F, 0.0003248421F, 0.0003423967F, 0.0003604132F,
@@ skipping 1077 matching lines @@
     0.38890521F,    0.41417847F,    0.44109412F,    0.46975890F,
     0.50028648F,    0.53279791F,    0.56742212F,    0.60429640F,
     0.64356699F,    0.68538959F,    0.72993007F,    0.77736504F,
     0.82788260F,    0.88168307F,    0.9389798F,     1.F,
 };
 
 const float * const ff_vorbis_vwin[8] = {
       vwin64,  vwin128,  vwin256,  vwin512,
     vwin1024, vwin2048, vwin4096, vwin8192
 };