Merge commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Dec 2013 18:04:32 +0000 (19:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Dec 2013 18:04:32 +0000 (19:04 +0100)
commit4e1dc600a16e1ba302d7ac707670e4f6129d1dde
treefaf66ef166e373070fc2bb04e7c32c111ea42d5d
parent682b28b41098f4445581076c44fb8420306eacec
parent3a149e23d37f06d49ab0bb013a3b9cb0224bba5c
Merge commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c'

* commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c':
  hevc: Refactor decode_nal_sei_frame_packing_arrangement

Conflicts:
libavcodec/hevc_sei.c

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