From b8d6108cfcb81cd231b96f59411237f9e244d1c2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 7 Feb 2013 13:54:06 +0100 Subject: [PATCH] error_resilience: assert that unsupported B frame interpolation isnt used with h264 Signed-off-by: Michael Niedermayer --- libavcodec/error_resilience.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index eea5d6d5eb..d30be6aede 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -1186,6 +1186,7 @@ void ff_er_frame_end(MpegEncContext *s) int time_pp = s->pp_time; int time_pb = s->pb_time; + av_assert0(s->avctx->codec_id != AV_CODEC_ID_H264); ff_thread_await_progress(&s->next_picture_ptr->f, mb_y, 0); s->mv[0][0][0] = s->next_picture.f.motion_val[0][xy][0] * time_pb / time_pp; s->mv[0][0][1] = s->next_picture.f.motion_val[0][xy][1] * time_pb / time_pp;