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)
commit1dab49c344409e6a5a0bf86ad0d0488bc192f933
tree2fa0c2a1bda55fe079a404b545bcd0aae474bfb3
parent2c9fc694f50a01c10448b4ed08b4d6adcfaaa3a7
parentbacc2869f37b17b2a89e1083289fdaf7f95f27bc
Merge commit 'bacc2869f37b17b2a89e1083289fdaf7f95f27bc'

* commit 'bacc2869f37b17b2a89e1083289fdaf7f95f27bc':
  mpeg12dec: parse frame packing arrangement user_data and save relevant stereo3d information

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