Merge commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9'

* commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9':
  qsvenc_hevc: fix enum declaration

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-25 23:40:06 +02:00
commit af08d8bfbb

View File

@ -36,11 +36,11 @@
#include "qsv_internal.h"
#include "qsvenc.h"
enum {
enum LoadPlugin {
LOAD_PLUGIN_NONE,
LOAD_PLUGIN_HEVC_SW,
LOAD_PLUGIN_HEVC_HW,
} LoadPlugin;
};
typedef struct QSVHEVCEncContext {
AVClass *class;