Merge commit '952f943d40e9dbcd68bc851460cc99268091a294'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 00:20:45 +0000 (01:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 00:22:35 +0000 (01:22 +0100)
commit10ac6f3ce9ae4065a5b72ddfaded45f75b357518
tree75473d06359d37848c47425c3a97874adeb7ed14
parentddfdcd2b5ecce0914c1eefa6269060bdbc879b17
parent952f943d40e9dbcd68bc851460cc99268091a294
Merge commit '952f943d40e9dbcd68bc851460cc99268091a294'

* commit '952f943d40e9dbcd68bc851460cc99268091a294':
  FATE: add a jv test

Conflicts:
tests/fate/video.mak
tests/ref/fate/jv

See: 7c52070131b7eb7f867fe1eab7383498814826df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/video.mak