"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "libavcodec/h264_refs.c" between
libav-12.tar.gz and libav-12.1.tar.gz

About: libav provides cross-platform tools ("avconv") and libraries to convert, manipulate and stream a wide range of multimedia (audio and video) formats and protocols.

h264_refs.c  (libav-12):h264_refs.c  (libav-12.1)
skipping to change at line 560 skipping to change at line 560
} }
int ff_h264_execute_ref_pic_marking(H264Context *h) int ff_h264_execute_ref_pic_marking(H264Context *h)
{ {
MMCO *mmco = h->mmco; MMCO *mmco = h->mmco;
int mmco_count; int mmco_count;
int i, av_uninit(j); int i, av_uninit(j);
int current_ref_assigned = 0, err = 0; int current_ref_assigned = 0, err = 0;
H264Picture *av_uninit(pic); H264Picture *av_uninit(pic);
if (!h->ps.sps) {
av_log(h->avctx, AV_LOG_ERROR, "SPS is unset\n");
err = AVERROR_INVALIDDATA;
goto out;
}
if (!h->explicit_ref_marking) if (!h->explicit_ref_marking)
generate_sliding_window_mmcos(h); generate_sliding_window_mmcos(h);
mmco_count = h->nb_mmco; mmco_count = h->nb_mmco;
if ((h->avctx->debug & FF_DEBUG_MMCO) && mmco_count == 0) if ((h->avctx->debug & FF_DEBUG_MMCO) && mmco_count == 0)
av_log(h->avctx, AV_LOG_DEBUG, "no mmco here\n"); av_log(h->avctx, AV_LOG_DEBUG, "no mmco here\n");
for (i = 0; i < mmco_count; i++) { for (i = 0; i < mmco_count; i++) {
int av_uninit(structure), av_uninit(frame_num); int av_uninit(structure), av_uninit(frame_num);
if (h->avctx->debug & FF_DEBUG_MMCO) if (h->avctx->debug & FF_DEBUG_MMCO)
skipping to change at line 727 skipping to change at line 733
assert(i < 16); assert(i < 16);
remove_long(h, i, 0); remove_long(h, i, 0);
} else { } else {
pic = h->short_ref[h->short_ref_count - 1]; pic = h->short_ref[h->short_ref_count - 1];
remove_short(h, pic->frame_num, 0); remove_short(h, pic->frame_num, 0);
} }
} }
print_short_term(h); print_short_term(h);
print_long_term(h); print_long_term(h);
out:
return (h->avctx->err_recognition & AV_EF_EXPLODE) ? err : 0; return (h->avctx->err_recognition & AV_EF_EXPLODE) ? err : 0;
} }
int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb, int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb,
const H2645NAL *nal, void *logctx) const H2645NAL *nal, void *logctx)
{ {
int i; int i;
MMCO *mmco = sl->mmco; MMCO *mmco = sl->mmco;
int nb_mmco = 0; int nb_mmco = 0;
 End of changes. 2 change blocks. 
0 lines changed or deleted 7 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS