videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit '51822879e7732ee8175dad98dde1a135f6e5c1a4' 

* commit '51822879e7732ee8175dad98dde1a135f6e5c1a4':
  h264_mb: constify block_offset

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-21 17:22:12 +01:00
parent bc5383e6c4 51822879e7
commit 06e5b331f5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264_mb.c
View File

@ -616,7 +616,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h,
int simple,
int transform_bypass,
int pixel_shift,
int *block_offset,
const int *block_offset,
int linesize,
uint8_t *dest_y, int p)
{
@ -737,7 +737,7 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, H264SliceCon
int is_h264, int simple,
int transform_bypass,
int pixel_shift,
int *block_offset,
const int *block_offset,
int linesize,
uint8_t *dest_y, int p)
{

4
libavcodec/h264_mb_template.c
View File

@ -49,7 +49,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl)
uint8_t *dest_y, *dest_cb, *dest_cr;
int linesize, uvlinesize /*dct_offset*/;
int i, j;
int *block_offset = &h->block_offset[0];
const int *block_offset = &h->block_offset[0];
const int transform_bypass = !SIMPLE && (sl->qscale == 0 && h->sps.transform_bypass);
/* is_h264 should always be true if SVQ3 is disabled. */
const int is_h264 = !CONFIG_SVQ3_DECODER || SIMPLE || h->avctx->codec_id == AV_CODEC_ID_H264;
@ -278,7 +278,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext
uint8_t *dest[3];
int linesize;
int i, j, p;
int *block_offset = &h->block_offset[0];
const int *block_offset = &h->block_offset[0];
const int transform_bypass = !SIMPLE && (sl->qscale == 0 && h->sps.transform_bypass);
const int plane_count = (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) ? 3 : 1;