diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 15:56:19 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-19 15:56:19 +0100 |
| commit | b6e88bf323bb2b23f5f1e29547aa61fa2c1e2e2c (patch) | |
| tree | f584195a92429e08d336a6597c22bfc98c0ea90a /libavcodec | |
| parent | 842e7853c73d09f8e262d379b5bc1479098655d8 (diff) | |
| parent | b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661 (diff) | |
Merge commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661'
* commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661':
h264: Kill broken disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_ps.c | 31 | ||||
| -rw-r--r-- | libavcodec/h264_refs.c | 9 |
2 files changed, 0 insertions, 40 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index c330efddcb..65d164d81c 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -787,37 +787,6 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct if (pps->slice_group_count > 1) { pps->mb_slice_group_map_type = get_ue_golomb(gb); av_log(avctx, AV_LOG_ERROR, "FMO not supported\n"); - switch (pps->mb_slice_group_map_type) { - case 0: -#if 0 - | for (i = 0; i <= num_slice_groups_minus1; i++) | | | - | run_length[i] |1 |ue(v) | -#endif - break; - case 2: -#if 0 - | for (i = 0; i < num_slice_groups_minus1; i++) { | | | - | top_left_mb[i] |1 |ue(v) | - | bottom_right_mb[i] |1 |ue(v) | - | } | | | -#endif - break; - case 3: - case 4: - case 5: -#if 0 - | slice_group_change_direction_flag |1 |u(1) | - | slice_group_change_rate_minus1 |1 |ue(v) | -#endif - break; - case 6: -#if 0 - | slice_group_id_cnt_minus1 |1 |ue(v) | - | for (i = 0; i <= slice_group_id_cnt_minus1; i++)| | | - | slice_group_id[i] |1 |u(v) | -#endif - break; - } } pps->ref_count[0] = get_ue_golomb(gb) + 1; pps->ref_count[1] = get_ue_golomb(gb) + 1; diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index ad296753c3..af70829594 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -846,15 +846,6 @@ int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb, mmco[i].short_pic_num = (sl->curr_pic_num - get_ue_golomb_long(gb) - 1) & (sl->max_pic_num - 1); -#if 0 - if (mmco[i].short_pic_num >= h->short_ref_count || - !h->short_ref[mmco[i].short_pic_num]) { - av_log(s->avctx, AV_LOG_ERROR, - "illegal short ref in memory management control " - "operation %d\n", mmco); - return -1; - } -#endif } if (opcode == MMCO_SHORT2LONG || opcode == MMCO_LONG2UNUSED || opcode == MMCO_LONG || opcode == MMCO_SET_MAX_LONG) { |