Merge commit '641e57230b460bef52c88e61087d97c223910bea'

* commit '641e57230b460bef52c88e61087d97c223910bea':
  fate: add on2avc audio test

Conflicts:
	tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

tests/fate/audio.mak

@@ -48,6 +48,9 @@ fate-nellymoser-aref-encode: CMP_SHIFT = -244
 fate-nellymoser-aref-encode: CMP_TARGET = 9612
 fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268
 
+FATE_SAMPLES_AUDIO-$(call DEMDEC, AVI, ON2AVC) += fate-on2avc
+fate-on2avc: CMD = framecrc -i $(TARGET_SAMPLES)/vp7/potter-40.vp7 -frames 30 -vn
+
 FATE_SAMPLES_AUDIO-$(call DEMDEC, PAF, PAF_AUDIO) += fate-paf-audio
 fate-paf-audio: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -vn
 

tests/ref/fate/on2avc

@@ -0,0 +1,31 @@
+#tb 0: 1/16000
+0,          0,          0,     1024,     2048, 0x00000000
+0,       1024,       1024,     1024,     2048, 0x96ee1301
+0,       2048,       2048,     1024,     2048, 0xe2a81605
+0,       3072,       3072,     1024,     2048, 0x3a0e15f9
+0,       4096,       4096,     1024,     2048, 0xcb4515d6
+0,       5120,       5120,     1024,     2048, 0x75021609
+0,       6144,       6144,     1024,     2048, 0xefa91606
+0,       7168,       7168,     1024,     2048, 0x6e8315d0
+0,       8192,       8192,     1024,     2048, 0xd03815fe
+0,       9216,       9216,     1024,     2048, 0xb38115cd
+0,      10240,      10240,     1024,     2048, 0x4ece15ec
+0,      11264,      11264,     1024,     2048, 0x33741600
+0,      12288,      12288,     1024,     2048, 0x97e915d7
+0,      13312,      13312,     1024,     2048, 0xc23815fc
+0,      14336,      14336,     1024,     2048, 0x069a15ef
+0,      15360,      15360,     1024,     2048, 0x0b3a15e7
+0,      16384,      16384,     1024,     2048, 0x9d2c1616
+0,      17408,      17408,     1024,     2048, 0x810d15d9
+0,      18432,      18432,     1024,     2048, 0x79a215ed
+0,      19456,      19456,     1024,     2048, 0x58be15e3
+0,      20480,      20480,     1024,     2048, 0x577415ed
+0,      21504,      21504,     1024,     2048, 0x208015ee
+0,      22528,      22528,     1024,     2048, 0x2f6815da
+0,      23552,      23552,     1024,     2048, 0x42e41609
+0,      24576,      24576,     1024,     2048, 0x85a915d2
+0,      25600,      25600,     1024,     2048, 0x8b8215f0
+0,      26624,      26624,     1024,     2048, 0x92c21602
+0,      27648,      27648,     1024,     2048, 0xb28115db
+0,      28672,      28672,     1024,     2048, 0x5e7615f6
+0,      29696,      29696,     1024,     2048, 0x6b1c15f6