• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 97962b27
    Michael Niedermayer authored
    * qatar/master:
      lavc: VP9 decoder
    
    Conflicts:
    	Changelog
    	doc/general.texi
    	libavcodec/Makefile
    	libavcodec/version.h
    	libavcodec/vp9.c
    	libavcodec/vp9.h
    	libavcodec/vp9data.h
    	libavcodec/vp9dsp.c
    	libavcodec/x86/Makefile
    	libavcodec/x86/vp9dsp.asm
    	libavcodec/x86/vp9dsp_init.c
    	tests/fate/vpx.mak
    	tests/ref/fate/vp9-00-quantizer-00
    	tests/ref/fate/vp9-00-quantizer-01
    	tests/ref/fate/vp9-00-quantizer-02
    	tests/ref/fate/vp9-00-quantizer-03
    	tests/ref/fate/vp9-00-quantizer-04
    	tests/ref/fate/vp9-00-quantizer-05
    	tests/ref/fate/vp9-00-quantizer-06
    	tests/ref/fate/vp9-00-quantizer-07
    	tests/ref/fate/vp9-00-quantizer-08
    	tests/ref/fate/vp9-00-quantizer-09
    	tests/ref/fate/vp9-00-quantizer-10
    	tests/ref/fate/vp9-00-quantizer-11
    	tests/ref/fate/vp9-00-quantizer-12
    	tests/ref/fate/vp9-00-quantizer-13
    	tests/ref/fate/vp9-00-quantizer-14
    	tests/ref/fate/vp9-00-quantizer-15
    	tests/ref/fate/vp9-00-quantizer-16
    	tests/ref/fate/vp9-00-quantizer-17
    	tests/ref/fate/vp9-00-quantizer-18
    	tests/ref/fate/vp9-00-quantizer-19
    	tests/ref/fate/vp9-00-quantizer-20
    	tests/ref/fate/vp9-00-quantizer-21
    	tests/ref/fate/vp9-00-quantizer-22
    	tests/ref/fate/vp9-00-quantizer-23
    	tests/ref/fate/vp9-00-quantizer-24
    	tests/ref/fate/vp9-00-quantizer-25
    	tests/ref/fate/vp9-00-quantizer-26
    	tests/ref/fate/vp9-00-quantizer-27
    	tests/ref/fate/vp9-00-quantizer-28
    	tests/ref/fate/vp9-00-quantizer-29
    	tests/ref/fate/vp9-00-quantizer-30
    	tests/ref/fate/vp9-00-quantizer-31
    	tests/ref/fate/vp9-00-quantizer-32
    	tests/ref/fate/vp9-00-quantizer-33
    	tests/ref/fate/vp9-00-quantizer-34
    	tests/ref/fate/vp9-00-quantizer-35
    	tests/ref/fate/vp9-00-quantizer-36
    	tests/ref/fate/vp9-00-quantizer-37
    	tests/ref/fate/vp9-00-quantizer-38
    	tests/ref/fate/vp9-00-quantizer-39
    	tests/ref/fate/vp9-00-quantizer-40
    	tests/ref/fate/vp9-00-quantizer-41
    	tests/ref/fate/vp9-00-quantizer-42
    	tests/ref/fate/vp9-00-quantizer-43
    	tests/ref/fate/vp9-00-quantizer-44
    	tests/ref/fate/vp9-00-quantizer-45
    	tests/ref/fate/vp9-00-quantizer-46
    	tests/ref/fate/vp9-00-quantizer-47
    	tests/ref/fate/vp9-00-quantizer-48
    	tests/ref/fate/vp9-00-quantizer-49
    	tests/ref/fate/vp9-00-quantizer-50
    	tests/ref/fate/vp9-00-quantizer-51
    	tests/ref/fate/vp9-00-quantizer-52
    	tests/ref/fate/vp9-00-quantizer-53
    	tests/ref/fate/vp9-00-quantizer-54
    	tests/ref/fate/vp9-00-quantizer-55
    	tests/ref/fate/vp9-00-quantizer-56
    	tests/ref/fate/vp9-00-quantizer-57
    	tests/ref/fate/vp9-00-quantizer-58
    	tests/ref/fate/vp9-00-quantizer-59
    	tests/ref/fate/vp9-00-quantizer-60
    	tests/ref/fate/vp9-00-quantizer-61
    	tests/ref/fate/vp9-00-quantizer-62
    	tests/ref/fate/vp9-00-quantizer-63
    	tests/ref/fate/vp9-01-sharpness-1
    	tests/ref/fate/vp9-01-sharpness-2
    	tests/ref/fate/vp9-01-sharpness-3
    	tests/ref/fate/vp9-01-sharpness-4
    	tests/ref/fate/vp9-01-sharpness-5
    	tests/ref/fate/vp9-01-sharpness-6
    	tests/ref/fate/vp9-01-sharpness-7
    	tests/ref/fate/vp9-02-size-08x08
    	tests/ref/fate/vp9-02-size-08x10
    	tests/ref/fate/vp9-02-size-08x16
    	tests/ref/fate/vp9-02-size-08x18
    	tests/ref/fate/vp9-02-size-08x32
    	tests/ref/fate/vp9-02-size-08x34
    	tests/ref/fate/vp9-02-size-08x64
    	tests/ref/fate/vp9-02-size-08x66
    	tests/ref/fate/vp9-02-size-10x08
    	tests/ref/fate/vp9-02-size-10x10
    	tests/ref/fate/vp9-02-size-10x16
    	tests/ref/fate/vp9-02-size-10x18
    	tests/ref/fate/vp9-02-size-10x32
    	tests/ref/fate/vp9-02-size-10x34
    	tests/ref/fate/vp9-02-size-10x64
    	tests/ref/fate/vp9-02-size-10x66
    	tests/ref/fate/vp9-02-size-16x08
    	tests/ref/fate/vp9-02-size-16x10
    	tests/ref/fate/vp9-02-size-16x16
    	tests/ref/fate/vp9-02-size-16x18
    	tests/ref/fate/vp9-02-size-16x32
    	tests/ref/fate/vp9-02-size-16x34
    	tests/ref/fate/vp9-02-size-16x64
    	tests/ref/fate/vp9-02-size-16x66
    	tests/ref/fate/vp9-02-size-18x08
    	tests/ref/fate/vp9-02-size-18x10
    	tests/ref/fate/vp9-02-size-18x16
    	tests/ref/fate/vp9-02-size-18x18
    	tests/ref/fate/vp9-02-size-18x32
    	tests/ref/fate/vp9-02-size-18x34
    	tests/ref/fate/vp9-02-size-18x64
    	tests/ref/fate/vp9-02-size-18x66
    	tests/ref/fate/vp9-02-size-32x08
    	tests/ref/fate/vp9-02-size-32x10
    	tests/ref/fate/vp9-02-size-32x16
    	tests/ref/fate/vp9-02-size-32x18
    	tests/ref/fate/vp9-02-size-32x32
    	tests/ref/fate/vp9-02-size-32x34
    	tests/ref/fate/vp9-02-size-32x64
    	tests/ref/fate/vp9-02-size-32x66
    	tests/ref/fate/vp9-02-size-34x08
    	tests/ref/fate/vp9-02-size-34x10
    	tests/ref/fate/vp9-02-size-34x16
    	tests/ref/fate/vp9-02-size-34x18
    	tests/ref/fate/vp9-02-size-34x32
    	tests/ref/fate/vp9-02-size-34x34
    	tests/ref/fate/vp9-02-size-34x64
    	tests/ref/fate/vp9-02-size-34x66
    	tests/ref/fate/vp9-02-size-64x08
    	tests/ref/fate/vp9-02-size-64x10
    	tests/ref/fate/vp9-02-size-64x16
    	tests/ref/fate/vp9-02-size-64x18
    	tests/ref/fate/vp9-02-size-64x32
    	tests/ref/fate/vp9-02-size-64x34
    	tests/ref/fate/vp9-02-size-64x64
    	tests/ref/fate/vp9-02-size-64x66
    	tests/ref/fate/vp9-02-size-66x08
    	tests/ref/fate/vp9-02-size-66x10
    	tests/ref/fate/vp9-02-size-66x16
    	tests/ref/fate/vp9-02-size-66x18
    	tests/ref/fate/vp9-02-size-66x32
    	tests/ref/fate/vp9-02-size-66x34
    	tests/ref/fate/vp9-02-size-66x64
    	tests/ref/fate/vp9-02-size-66x66
    	tests/ref/fate/vp9-03-deltaq
    	tests/ref/fate/vp9-03-size-196x196
    	tests/ref/fate/vp9-03-size-196x198
    	tests/ref/fate/vp9-03-size-196x200
    	tests/ref/fate/vp9-03-size-196x202
    	tests/ref/fate/vp9-03-size-196x208
    	tests/ref/fate/vp9-03-size-196x210
    	tests/ref/fate/vp9-03-size-196x224
    	tests/ref/fate/vp9-03-size-196x226
    	tests/ref/fate/vp9-03-size-198x196
    	tests/ref/fate/vp9-03-size-198x198
    	tests/ref/fate/vp9-03-size-198x200
    	tests/ref/fate/vp9-03-size-198x202
    	tests/ref/fate/vp9-03-size-198x208
    	tests/ref/fate/vp9-03-size-198x210
    	tests/ref/fate/vp9-03-size-198x224
    	tests/ref/fate/vp9-03-size-198x226
    	tests/ref/fate/vp9-03-size-200x196
    	tests/ref/fate/vp9-03-size-200x198
    	tests/ref/fate/vp9-03-size-200x200
    	tests/ref/fate/vp9-03-size-200x202
    	tests/ref/fate/vp9-03-size-200x208
    	tests/ref/fate/vp9-03-size-200x210
    	tests/ref/fate/vp9-03-size-200x224
    	tests/ref/fate/vp9-03-size-200x226
    	tests/ref/fate/vp9-03-size-202x196
    	tests/ref/fate/vp9-03-size-202x198
    	tests/ref/fate/vp9-03-size-202x200
    	tests/ref/fate/vp9-03-size-202x202
    	tests/ref/fate/vp9-03-size-202x208
    	tests/ref/fate/vp9-03-size-202x210
    	tests/ref/fate/vp9-03-size-202x224
    	tests/ref/fate/vp9-03-size-202x226
    	tests/ref/fate/vp9-03-size-208x196
    	tests/ref/fate/vp9-03-size-208x198
    	tests/ref/fate/vp9-03-size-208x200
    	tests/ref/fate/vp9-03-size-208x202
    	tests/ref/fate/vp9-03-size-208x208
    	tests/ref/fate/vp9-03-size-208x210
    	tests/ref/fate/vp9-03-size-208x224
    	tests/ref/fate/vp9-03-size-208x226
    	tests/ref/fate/vp9-03-size-210x196
    	tests/ref/fate/vp9-03-size-210x198
    	tests/ref/fate/vp9-03-size-210x200
    	tests/ref/fate/vp9-03-size-210x202
    	tests/ref/fate/vp9-03-size-210x208
    	tests/ref/fate/vp9-03-size-210x210
    	tests/ref/fate/vp9-03-size-210x224
    	tests/ref/fate/vp9-03-size-210x226
    	tests/ref/fate/vp9-03-size-224x196
    	tests/ref/fate/vp9-03-size-224x198
    	tests/ref/fate/vp9-03-size-224x200
    	tests/ref/fate/vp9-03-size-224x202
    	tests/ref/fate/vp9-03-size-224x208
    	tests/ref/fate/vp9-03-size-224x210
    	tests/ref/fate/vp9-03-size-224x224
    	tests/ref/fate/vp9-03-size-224x226
    	tests/ref/fate/vp9-03-size-226x196
    	tests/ref/fate/vp9-03-size-226x198
    	tests/ref/fate/vp9-03-size-226x200
    	tests/ref/fate/vp9-03-size-226x202
    	tests/ref/fate/vp9-03-size-226x208
    	tests/ref/fate/vp9-03-size-226x210
    	tests/ref/fate/vp9-03-size-226x224
    	tests/ref/fate/vp9-03-size-226x226
    	tests/ref/fate/vp9-2pass-akiyo
    	tests/ref/fate/vp9-segmentation-akiyo
    	tests/ref/fate/vp9-tiling-pedestrian
    
    Not merged at the request of the authors and maintainers
    "<ubitux> we have a lot of fixes they don't have, as well as optim actually"
    
    See: 848826f5Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    97962b27
vpx.mak 4.07 KB