Merge commit '175b53d051cf9e17583106c828c35d169f335ea3' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:18:35 +0000 (15:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:18:42 +0000 (15:18 +0200)
commitf6c1fdba22dc9f1e8a676949e9d404907ceda10c
treef7a269642baef0a1140ba5db652fbced95e7dbb8
parentf294748cbce9627718d0c4112d8a1c0d2d93dfb1
parent175b53d051cf9e17583106c828c35d169f335ea3
Merge commit '175b53d051cf9e17583106c828c35d169f335ea3' into release/1.1

* commit '175b53d051cf9e17583106c828c35d169f335ea3':
  h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3

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