OSDN Git Service

Merge commit '5b10ef729f610fcbc9c485e7b643ce53268144cb'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 20:53:23 +0000 (21:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 20:53:23 +0000 (21:53 +0100)
commitbe6e81463c72dda837d62ef0a7c26f35a666d1d3
tree54e21d585a93dfb9d1adf47c5c4d2513154b043c
parent7a6034805305cb5d6a3d755d774f0ad09119049e
parent5b10ef729f610fcbc9c485e7b643ce53268144cb
Merge commit '5b10ef729f610fcbc9c485e7b643ce53268144cb'

* commit '5b10ef729f610fcbc9c485e7b643ce53268144cb':
  h264: parse frame packing arrangement SEI messages and save relevant stereo3d information

Conflicts:
libavcodec/h264.c
libavcodec/h264_sei.c

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