[FFmpeg-cvslog] Merge commit '04763c6f87690b31cfcd0d324cf36a451531dcd0'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Mar 18 19:31:57 2017 +0100| [39d2b48757410000c4ea10c15828b964bb68e2df] | committer: Clément Bœsch

Merge commit '04763c6f87690b31cfcd0d324cf36a451531dcd0'

* commit '04763c6f87690b31cfcd0d324cf36a451531dcd0':
  h264_direct: use the reference mask from the actual reference

This commit is a noop, see d8151a7e944aea52d167571badc247c8d9972847

Merged-by: Clément Bœsch <u at pkh.me>

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