Merge commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Jan 2014 20:37:39 +0000 (21:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Jan 2014 20:44:18 +0000 (21:44 +0100)
commitf2cb3b36aca220a05ddb797e2d9c220613a3755f
treeb2fe2b19fcc620be0be06215e0090d9f0d781284
parent357a733f91ac96d5806856b83081f3f7dace01fe
parent7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f
Merge commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f'

* commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f':
  h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3

Conflicts:
libavcodec/h264.c

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