Merge commit '1493b237bd3f9707319ac58d315ce45312900c10'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 09:54:23 +0000 (11:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 09:56:37 +0000 (11:56 +0200)
* commit '1493b237bd3f9707319ac58d315ce45312900c10':
  hevc: Replace nal type chek with equivalent IS_IRAP macro

Conflicts:
libavcodec/hevc.c

See: e2760de60514b949c0a5584d797d933f711f5b14
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge