diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-10-02 21:07:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-02 21:30:21 +0200 |
| commit | b89a0c9d7f4c4a23d709761033ad5e2f9c2881fa (patch) | |
| tree | 557445112dbe2b5de2da7252d8012f63181e7a59 /libavcodec/h264.h | |
| parent | efedf09378e82cc75d56e881842c5bf14b2c9d05 (diff) | |
| download | ffmpeg-b89a0c9d7f4c4a23d709761033ad5e2f9c2881fa.tar.gz | |
h264: fix intra 16x16 mode check when using mbaff and constrained_intra_pred.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a4fd95b5d511384ed3ce388d8d20a16b1c4c0530)
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 5b07f3775d..0a380e03c1 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -658,7 +658,12 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h); /** * Check if the top & left blocks are available if needed & change the dc mode so it only uses the available blocks. */ -int ff_h264_check_intra_pred_mode(H264Context *h, int mode); +int ff_h264_check_intra16x16_pred_mode(H264Context *h, int mode); + +/** + * Check if the top & left blocks are available if needed & change the dc mode so it only uses the available blocks. + */ +int ff_h264_check_intra_chroma_pred_mode(H264Context *h, int mode); void ff_h264_write_back_intra_pred_mode(H264Context *h); void ff_h264_hl_decode_mb(H264Context *h); |