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)
commit12e36a3dfdc619fcb479ae10e73679d69b19b2d7
tree42b57f0395b81a30dc496e215c3ebe933101e794
parent20526f2e2f58cb226e9891aec7d7e438a7ddb6d2
parenta4fbd55d6e03eabdbecc3b7892ec09eb8062d066
Merge commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066'

* commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066':
  h264: er: Copy from the previous reference only if compatible

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