[FFmpeg-cvslog] Merge commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  1 04:30:53 2014 +0100| [3ec3f70ddb1b97fd6174ab3ca8617d8a1a6516ab] | committer: Michael Niedermayer

Merge commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ec3f70ddb1b97fd6174ab3ca8617d8a1a6516ab
---