diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 18:55:22 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 18:55:22 +0100 |
commit | eef74b2e97139d8422f76a0f8241aed17fc0617d (patch) | |
tree | a3b2851c96fbe1cd527f1444c9bcdd47cfe99e61 /libavcodec/utils.c | |
parent | 8001e9f7d17e90b4b0898ba64e3b8bbd716c513c (diff) | |
parent | 93c553c71ef48550ff7c2aa7b5712a7e01f1999f (diff) | |
download | ffmpeg-eef74b2e97139d8422f76a0f8241aed17fc0617d.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().
Conflicts:
doc/APIchanges
libavcodec/utils.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index d6283a1e2a..81a210cac3 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -222,10 +222,12 @@ av_cold void avcodec_register(AVCodec *codec) codec->init_static_data(codec); } +#if FF_API_EMU_EDGE unsigned avcodec_get_edge_width(void) { return EDGE_WIDTH; } +#endif #if FF_API_SET_DIMENSIONS void avcodec_set_dimensions(AVCodecContext *s, int width, int height) @@ -1491,6 +1493,11 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code } } } + +#if FF_API_EMU_EDGE + /* force the emu edge flag on, since it's now always active */ + avctx->flags |= CODEC_FLAG_EMU_EDGE; +#endif } end: ff_unlock_avcodec(); |