RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc' 

* commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc':
  svq3: remove a pointless if()
  h264: remove a pointless if()

Conflicts:
	libavcodec/h264.c
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-16 14:30:21 +01:00
parent 131b9c924d d9ebb00dcb
commit 8b7568cc34
2 changed files with 186 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -1822,7 +1822,6 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h,
int qscale = p == 0 ? s->qscale : h->chroma_qp[p - 1];
block_offset += 16 * p;
if (IS_INTRA4x4(mb_type)) {
if (simple || !s->encoding) {
if (IS_8x8DCT(mb_type)) {
if (transform_bypass) {
idct_dc_add =
@ -1896,7 +1895,6 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h,
}
}
}
}
} else {
h->hpc.pred16x16[h->intra16x16_pred_mode](dest_y, linesize);
if (is_h264) {

3
libavcodec/svq3.c
View File

@ -863,14 +863,12 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
h->sps.chroma_format_idc = 1;
avctx->pix_fmt = avctx->codec->pix_fmts[0];
if (!s->context_initialized) {
h->chroma_qp[0] = h->chroma_qp[1] = 4;
svq3->halfpel_flag = 1;
svq3->thirdpel_flag = 1;
svq3->unknown_flag = 0;
/* prowl for the "SEQH" marker in the extradata */
extradata = (unsigned char *)avctx->extradata;
extradata_end = avctx->extradata + avctx->extradata_size;
@ -1005,7 +1003,6 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "svq3 memory allocation failed\n");
return AVERROR(ENOMEM);
}
}
return 0;
}