• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9eb99ab2
    Michael Niedermayer authored
    * qatar/master:
      fate: employ better names and add a convenient shorthand for vp6 tests
      arm/neon: dsputil: use correct size specifiers on vld1/vst1
      arm: dsputil: prettify some conditional instructions in put_pixels macros
      vqavideo: change x/y loop counters to the usual pattern
      avconv: use lrint() for rounding double timestamps
    
    Conflicts:
    	tests/ref/fate/vc1-ism
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9eb99ab2
vqavideo.c 21.2 KB