Merge commit '3d9fc21e593aa89b5877bd739268499b079052f2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Dec 2013 18:30:57 +0000 (19:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Dec 2013 18:30:57 +0000 (19:30 +0100)
commitd6acf45ec280be866698966947a0887841a6ea20
treecd33128f533bf6275562c8ab33c7bb2ea36f90b4
parent4e1dc600a16e1ba302d7ac707670e4f6129d1dde
parent3d9fc21e593aa89b5877bd739268499b079052f2
Merge commit '3d9fc21e593aa89b5877bd739268499b079052f2'

* commit '3d9fc21e593aa89b5877bd739268499b079052f2':
  h264: Refactor decode_frame_packing_arrangement

Conflicts:
libavcodec/h264_sei.c

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