Merge commit '11f3d5c69b711a1f1631961921ecd20d31f8336d'
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 16:01:49 +0000 (18:01 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 16:43:59 +0000 (18:43 +0200)
* commit '11f3d5c69b711a1f1631961921ecd20d31f8336d':
  hap: Name enums, remove unused struct member

Conflicts:
libavcodec/hap.h

See: 440c26e9c46bb26bc1fc8306561ed6962ae7d3bf
See: d8488090e5070187e9d8d0a93b8d841f26bde990
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Trivial merge