Merge commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9'
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 25 Jul 2015 21:40:06 +0000 (23:40 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 25 Jul 2015 21:47:54 +0000 (23:47 +0200)
* commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9':
  qsvenc_hevc: fix enum declaration

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
libavcodec/qsvenc_hevc.c

Simple merge