generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpegvideo: move REBASE_PICTURE where it is used

Browse Source 
Drop an unused #undef from h264 decoder.
This commit is contained in:
Vittorio Giovara 2014-12-09 16:47:53 +00:00
parent 63fcedcf01
commit d75190aa93
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264_slice.c
View File

@ -422,7 +422,7 @@ static void clone_tables(H264Context *dst, H264Context *src, int i)
} }
#define IN_RANGE(a, b, size) (((a) >= (b)) && ((a) < ((b) + (size)))) #define IN_RANGE(a, b, size) (((a) >= (b)) && ((a) < ((b) + (size))))
#undef REBASE_PICTURE
#define REBASE_PICTURE(pic, new_ctx, old_ctx) \ #define REBASE_PICTURE(pic, new_ctx, old_ctx) \
((pic && pic >= old_ctx->DPB && \ ((pic && pic >= old_ctx->DPB && \
pic < old_ctx->DPB + H264_MAX_PICTURE_COUNT) ? \ pic < old_ctx->DPB + H264_MAX_PICTURE_COUNT) ? \

5
libavcodec/mpegvideo.c
View File

@ -961,6 +961,11 @@ do {\
UPDATE_PICTURE(last_picture); UPDATE_PICTURE(last_picture);
UPDATE_PICTURE(next_picture); UPDATE_PICTURE(next_picture);
#define REBASE_PICTURE(pic, new_ctx, old_ctx) \
((pic && pic >= old_ctx->picture && \
pic < old_ctx->picture + MAX_PICTURE_COUNT) ? \
&new_ctx->picture[pic - old_ctx->picture] : NULL)
s->last_picture_ptr = REBASE_PICTURE(s1->last_picture_ptr, s, s1); s->last_picture_ptr = REBASE_PICTURE(s1->last_picture_ptr, s, s1);
s->current_picture_ptr = REBASE_PICTURE(s1->current_picture_ptr, s, s1); s->current_picture_ptr = REBASE_PICTURE(s1->current_picture_ptr, s, s1);
s->next_picture_ptr = REBASE_PICTURE(s1->next_picture_ptr, s, s1); s->next_picture_ptr = REBASE_PICTURE(s1->next_picture_ptr, s, s1);

5
libavcodec/mpegvideo.h
View File

@ -659,11 +659,6 @@ typedef struct MpegEncContext {
AVFrame *tmp_frames[MAX_B_FRAMES + 2]; AVFrame *tmp_frames[MAX_B_FRAMES + 2];
} MpegEncContext; } MpegEncContext;
#define REBASE_PICTURE(pic, new_ctx, old_ctx) \
((pic && pic >= old_ctx->picture && \
pic < old_ctx->picture + MAX_PICTURE_COUNT) ? \
&new_ctx->picture[pic - old_ctx->picture] : NULL)
/* mpegvideo_enc common options */ /* mpegvideo_enc common options */
#define FF_MPV_FLAG_SKIP_RD 0x0001 #define FF_MPV_FLAG_SKIP_RD 0x0001
#define FF_MPV_FLAG_STRICT_GOP 0x0002 #define FF_MPV_FLAG_STRICT_GOP 0x0002