Merge commit 'd9ebb00d'

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

Conflicts:
	libavcodec/h264.c
	libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/h264.c

@@ -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) {

libavcodec/svq3.c

@@ -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;
 }