virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

error_resilience: assert that unsupported B frame interpolation isnt used with h264

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-02-07 13:54:06 +01:00
parent 7f23b2a9d0
commit b8d6108cfc
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/error_resilience.c
View File

@@ -1186,6 +1186,7 @@ void ff_er_frame_end(MpegEncContext *s)
int time_pp = s->pp_time; int time_pp = s->pp_time;
int time_pb = s->pb_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); 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][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; s->mv[0][0][1] = s->next_picture.f.motion_val[0][xy][1] * time_pb / time_pp;