Merge commit '51ae8e26af8f5b26efb41edc0fe4812368d16ae9' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 23:46:55 +0000 (01:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 23:46:59 +0000 (01:46 +0200)
commitced5c8e6b36fa219cf7ea7d934da2105ae99a887
treed88c6558e611376f1937b4b7a278c7facd2e639a
parent1e83191d5c830a836bcd03d520272ef711503ac9
parent51ae8e26af8f5b26efb41edc0fe4812368d16ae9
Merge commit '51ae8e26af8f5b26efb41edc0fe4812368d16ae9' into release/0.10

* commit '51ae8e26af8f5b26efb41edc0fe4812368d16ae9':
  h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3

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