[FFmpeg-cvslog] Merge commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 15 22:29:47 2015 +0200| [12e36a3dfdc619fcb479ae10e73679d69b19b2d7] | committer: Michael Niedermayer

Merge commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12e36a3dfdc619fcb479ae10e73679d69b19b2d7
---