diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:46:55 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:46:59 +0200 |
commit | ced5c8e6b36fa219cf7ea7d934da2105ae99a887 (patch) | |
tree | d88c6558e611376f1937b4b7a278c7facd2e639a /libavcodec/audioconvert.h | |
parent | 1e83191d5c830a836bcd03d520272ef711503ac9 (diff) | |
parent | 51ae8e26af8f5b26efb41edc0fe4812368d16ae9 (diff) | |
download | ffmpeg-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 'libavcodec/audioconvert.h')
0 files changed, 0 insertions, 0 deletions