aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-03 01:46:55 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-03 01:46:59 +0200
commitced5c8e6b36fa219cf7ea7d934da2105ae99a887 (patch)
treed88c6558e611376f1937b4b7a278c7facd2e639a /.gitignore
parent1e83191d5c830a836bcd03d520272ef711503ac9 (diff)
parent51ae8e26af8f5b26efb41edc0fe4812368d16ae9 (diff)
downloadffmpeg-ced5c8e6b36fa219cf7ea7d934da2105ae99a887.tar.gz
Merge commit '51ae8e26af8f5b26efb41edc0fe4812368d16ae9' into release/0.10
* commit '51ae8e26af8f5b26efb41edc0fe4812368d16ae9': h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions