diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:54:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:59:45 +0100 |
| commit | b8d6108cfcb81cd231b96f59411237f9e244d1c2 (patch) | |
| tree | e27e7f6f1c3d8642a440b6b95da1b0b630e17642 /libavcodec | |
| parent | 7f23b2a9d0da328e6939de87a0ef509842b3a907 (diff) | |
| download | ffmpeg-b8d6108cfcb81cd231b96f59411237f9e244d1c2.tar.gz | |
error_resilience: assert that unsupported B frame interpolation isnt used with h264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/error_resilience.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |