summaryrefslogtreecommitdiff
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-23 16:04:31 -0300
committerJames Almer <jamrial@gmail.com>2017-10-23 16:04:31 -0300
commit7b550c5f84f21ce883e86bc91f16093641d5dc85 (patch)
tree5cffe208a3e3c1577e0be2efe49310745d889100 /libavcodec/utils.c
parentd658e04337c590043190718ec4a8137d3e8216b9 (diff)
parentb3739599bda740ac12d3dde31a331b744df99123 (diff)
Merge commit 'b3739599bda740ac12d3dde31a331b744df99123'
* commit 'b3739599bda740ac12d3dde31a331b744df99123': lavc: Drop deprecated emu edge functionality Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 05f4302ad1..caf988ee4e 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -191,13 +191,6 @@ 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
-
int ff_set_dimensions(AVCodecContext *s, int width, int height)
{
int ret = av_image_check_size2(width, height, s->max_pixels, AV_PIX_FMT_NONE, 0, s);