RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Michael Niedermayer 2013-02-07 13:48:56 +01:00
parent d5518545d1 c5fcdb4402
commit 7f23b2a9d0
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/error_resilience.c
View File

@ -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;

3
libavcodec/h264.h
View File

@ -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