apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-13 12:34:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661'

Browse Source 
* commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661':
  h264: Kill broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch
2017-03-19 15:56:19 +01:00
parent 842e7853c7 b96f0ab3d2
commit b6e88bf323
2 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/h264_refs.c
View File

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