diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-01-02 11:07:11 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-01-20 12:52:28 +0100 |
| commit | 93c553c71ef48550ff7c2aa7b5712a7e01f1999f (patch) | |
| tree | 0fe895e7ff6c82c6208c24e709afb4fdb766ce0b /libavcodec/utils.c | |
| parent | 024db24912a39316b0ef0b7d793307d62da038f4 (diff) | |
| download | ffmpeg-93c553c71ef48550ff7c2aa7b5712a7e01f1999f.tar.gz | |
lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().
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 ed68d0f555..2e418ec46c 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -127,10 +127,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) @@ -1089,6 +1091,11 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code ret = AVERROR(EINVAL); goto free_and_end; } + +#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: entangled_thread_counter--; |