Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 May 2012 18:43:41 +0000 (20:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 May 2012 18:57:39 +0000 (20:57 +0200)
commit9eb99ab25b5ec9af9e575371c9ef84a37c63b3e5
treedf92b2b44496b4268d52c306974b92009b6f764e
parentde1824e970d448a84bedce4936c301c322baa714
parentec2dbec84d94129207ed0f2a1151679fab305060
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
libavcodec/arm/dsputil_neon.S
libavcodec/vqavideo.c
tests/fate/vpx.mak