diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-27 16:34:40 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-27 16:34:40 +0100 |
commit | a2922b5d614ca6db025364f47bc4a1e4812859aa (patch) | |
tree | ce37baec9ca2a82cd1a91c83ad4959fbfc76c421 /libavcodec/h264.h | |
parent | c18535399d2597afd8855ccaa4416b0999d0d7f9 (diff) | |
parent | ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad (diff) |
Merge commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad'
* commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad':
h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r-- | libavcodec/h264.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index e6559950fd..302f09a513 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -900,19 +900,6 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb, int ff_generate_sliding_window_mmcos(H264Context *h, int first_slice); -/** - * 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_intra4x4_pred_mode(const H264Context *h, H264SliceContext *sl); - -/** - * 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(const H264Context *h, H264SliceContext *sl, - int mode, int is_chroma); - void ff_h264_hl_decode_mb(const H264Context *h, H264SliceContext *sl); int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size); int ff_h264_decode_init(AVCodecContext *avctx); |