Merge commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2' n2.3-dev
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 03:30:53 +0000 (04:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 03:30:57 +0000 (04:30 +0100)
commit3ec3f70ddb1b97fd6174ab3ca8617d8a1a6516ab
treec084703a72400ec6b9f39a1f26dbdd45069c29f9
parente4a6310cce5c1663f68253c50f364fc0c055f05a
parente70ab7c1f5005041bba0e4efc1165410f83495b2
Merge commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2'

* commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2':
  h264: add MVCD to the list of High profiles in SPS

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