Merge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 22:15:34 +0000 (00:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 22:19:43 +0000 (00:19 +0200)
commitefc66d69bfb622e874d883e0b304cf18b12e41bd
tree01adc68c2448e4f1950c37348db09790b092f875
parentcd0dc88751db969964e7b40c4d4b5fd446ac1589
parent0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50
Merge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'

* commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50':
  hevc: parse display orientation SEI message

Conflicts:
libavcodec/hevc.h
libavcodec/hevc_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_sei.c