mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-28 20:26:14 +02:00
Merge commit 'c5fcdb440237f06f6c954185ab60970cabf786a2'
* commit 'c5fcdb440237f06f6c954185ab60970cabf786a2': error_resilience: remove a useless if() and FIXME h264: remove silly macros Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
7f23b2a9d0
@ -1186,11 +1186,7 @@ void ff_er_frame_end(MpegEncContext *s)
|
||||
int time_pp = s->pp_time;
|
||||
int time_pb = s->pb_time;
|
||||
|
||||
if (s->avctx->codec_id == AV_CODEC_ID_H264) {
|
||||
// FIXME
|
||||
} else {
|
||||
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][1] = s->next_picture.f.motion_val[0][xy][1] * time_pb / time_pp;
|
||||
s->mv[1][0][0] = s->next_picture.f.motion_val[0][xy][0] * (time_pb - time_pp) / time_pp;
|
||||
|
@ -37,9 +37,6 @@
|
||||
#include "h264qpel.h"
|
||||
#include "rectangle.h"
|
||||
|
||||
#define interlaced_dct interlaced_dct_is_a_bad_name
|
||||
#define mb_intra mb_intra_is_not_initialized_see_mb_type
|
||||
|
||||
#define MAX_SPS_COUNT 32
|
||||
#define MAX_PPS_COUNT 256
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user