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)
* commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b':
  vaapi_h264: Fix frame_num after non-reference frames

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

Simple merge