Merge commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jun 2015 20:29:47 +0000 (22:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jun 2015 20:30:53 +0000 (22:30 +0200)
* commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066':
  h264: er: Copy from the previous reference only if compatible

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

Trivial merge