Merge commit '36f3aec3630f27df64f4ff2b52a1c9ced760eb52'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Oct 2014 19:38:16 +0000 (21:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Oct 2014 19:38:16 +0000 (21:38 +0200)
commit578da1f0dd1bd28b4bdee17b2f7a12c8bde13555
tree1aa65953d4d8dfad9b798dc8de343afe830a0b38
parent4ba6371a83c914c978aa22b804f00fb876397d98
parent36f3aec3630f27df64f4ff2b52a1c9ced760eb52
Merge commit '36f3aec3630f27df64f4ff2b52a1c9ced760eb52'

* commit '36f3aec3630f27df64f4ff2b52a1c9ced760eb52':
  fate-vc1_ilaced_twomv: use -flags +bitexact

Conflicts:
tests/ref/fate/vc1_ilaced_twomv

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