[FFmpeg-cvslog] error_resilience: assert that unsupported B frame interpolation isnt used with h264
Michael Niedermayer
git at videolan.org
Thu Feb 7 14:00:10 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 7 13:54:06 2013 +0100| [b8d6108cfcb81cd231b96f59411237f9e244d1c2] | committer: Michael Niedermayer
error_resilience: assert that unsupported B frame interpolation isnt used with h264
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b8d6108cfcb81cd231b96f59411237f9e244d1c2
---
libavcodec/error_resilience.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index eea5d6d..d30be6a 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;
More information about the ffmpeg-cvslog
mailing list