FFmpeg/libavcodec
Michael Niedermayer f2cb3b36ac 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>
2014-01-18 21:44:18 +01:00
..
2014-01-09 19:33:07 +01:00
2014-01-09 19:33:07 +01:00
2013-12-15 16:53:32 +01:00
2014-01-01 02:57:56 +01:00
2013-12-22 22:03:47 +01:00
2013-12-28 18:19:46 +01:00
2014-01-16 16:59:15 +01:00
2014-01-16 16:59:15 +01:00
2014-01-02 22:07:09 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00
2013-12-31 12:19:59 +01:00
2014-01-10 17:08:04 +01:00
2013-12-31 12:19:59 +01:00
2013-12-18 18:15:15 +01:00
2013-12-18 22:15:32 +01:00
2013-12-09 08:41:20 +01:00
2013-12-09 08:41:20 +01:00
2014-01-10 17:51:13 +01:00
2014-01-04 04:16:46 +01:00
2013-12-10 16:18:51 +01:00
2013-12-22 14:59:31 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00