Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 22:07:04 +0000 (00:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 22:07:04 +0000 (00:07 +0200)
commitcd0dc88751db969964e7b40c4d4b5fd446ac1589
tree287290217843c6aeefc76b1f0ed9ada495820bba
parentc67690f854452df397f3f735d0ff107a3fe51d87
parent18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09
Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'

* commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09':
  h264: parse display orientation SEI message

Conflicts:
libavcodec/h264.c

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