Skip to content
Snippets Groups Projects
Commit be6e8146 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '5b10ef72'


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

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

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 7a603480 5b10ef72
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment