[FFmpeg-cvslog] Merge commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f'
Michael Niedermayer
git at videolan.org
Sat Jan 18 21:45:55 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 18 21:37:39 2014 +0100| [f2cb3b36aca220a05ddb797e2d9c220613a3755f] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2cb3b36aca220a05ddb797e2d9c220613a3755f
---
More information about the ffmpeg-cvslog
mailing list