Merge commit 'bacc2869f37b17b2a89e1083289fdaf7f95f27bc'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 21:10:36 +0000 (22:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 21:10:57 +0000 (22:10 +0100)
* commit 'bacc2869f37b17b2a89e1083289fdaf7f95f27bc':
  mpeg12dec: parse frame packing arrangement user_data and save relevant stereo3d information

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

Simple merge