Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 21:25:38 +0000 (22:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 21:25:38 +0000 (22:25 +0100)
commit31a52a60c9778e3e39631a9722d4b7db931dc377
tree20b9bcdd19d1bc3570937308744aca43c24b2e3d
parent33dfddf65324dcb28114ea6907071605c2c3857b
parentacb77dff6af036192f6064c84f9cccc48582989e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hevc: parse frame packing arrangement SEI messages and save relevant stereo3d information

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