diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 21:27:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 21:27:10 +0100 |
| commit | 38c3ffbd55deb91622a58d8e20b15d263aadf131 (patch) | |
| tree | 75c675e884aa74af613d4cf35d32b151f5844bc7 /libavcodec/mpegvideo.h | |
| parent | 0a3ffcfc8224d38b3fe635d243ff1ec74df17c84 (diff) | |
| parent | d75190aa93206c02cb4f18a66d2c927d6a0198e1 (diff) | |
Merge commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1'
* commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1':
mpegvideo: move REBASE_PICTURE where it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 266e971f8c..c39b228708 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -681,11 +681,6 @@ typedef struct MpegEncContext { AVFrame *tmp_frames[MAX_B_FRAMES + 2]; } 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 */ #define FF_MPV_FLAG_SKIP_RD 0x0001 #define FF_MPV_FLAG_STRICT_GOP 0x0002 |