Merge commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:44:35 +0000 (15:44 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:44:35 +0000 (15:44 +0200)
commitd3327b7eda97523d1f4555f0f3615c69cd9ab65a
tree9efe19cfd8a76156d39f57b1f7d372d4af47fa7d
parent18b1b8be6a2a3f5c406f51417e8d19a517cf11a5
parentb51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b
Merge commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b'

* commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b':
  vaapi_h264: Fix frame_num after non-reference frames

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/vaapi_encode_h264.c