diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 15:18:35 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 15:18:42 +0200 |
commit | f6c1fdba22dc9f1e8a676949e9d404907ceda10c (patch) | |
tree | f7a269642baef0a1140ba5db652fbced95e7dbb8 /libavutil/parseutils.c | |
parent | f294748cbce9627718d0c4112d8a1c0d2d93dfb1 (diff) | |
parent | 175b53d051cf9e17583106c828c35d169f335ea3 (diff) | |
download | ffmpeg-f6c1fdba22dc9f1e8a676949e9d404907ceda10c.tar.gz |
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>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions