[FFmpeg-cvslog] h264: Kill broken disabled cruft
Diego Biurrun
git at videolan.org
Sun Mar 19 16:57:54 EET 2017
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Jul 30 13:49:08 2016 +0200| [b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661] | committer: Diego Biurrun
h264: Kill broken disabled cruft
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661
---
libavcodec/h264_ps.c | 31 -------------------------------
libavcodec/h264_refs.c | 9 ---------
2 files changed, 40 deletions(-)
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index d1b4280..36902e8 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -713,37 +713,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 aa9e882..3c55998 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -754,15 +754,6 @@ int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb,
mmco[i].short_pic_num =
(sl->curr_pic_num - get_ue_golomb(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) {
More information about the ffmpeg-cvslog
mailing list