diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 16:04:31 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 16:04:31 -0300 |
| commit | 7b550c5f84f21ce883e86bc91f16093641d5dc85 (patch) | |
| tree | 5cffe208a3e3c1577e0be2efe49310745d889100 /fftools | |
| parent | d658e04337c590043190718ec4a8137d3e8216b9 (diff) | |
| parent | b3739599bda740ac12d3dde31a331b744df99123 (diff) | |
| download | ffmpeg-7b550c5f84f21ce883e86bc91f16093641d5dc85.tar.gz | |
Merge commit 'b3739599bda740ac12d3dde31a331b744df99123'
* commit 'b3739599bda740ac12d3dde31a331b744df99123':
lavc: Drop deprecated emu edge functionality
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'fftools')
| -rw-r--r-- | fftools/ffmpeg_opt.c | 3 | ||||
| -rw-r--r-- | fftools/ffplay.c | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index d441d29390..3a947d8686 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -796,9 +796,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ist->dec_ctx->height = st->codec->height; ist->dec_ctx->coded_width = st->codec->coded_width; ist->dec_ctx->coded_height = st->codec->coded_height; -#if FF_API_EMU_EDGE - ist->dec_ctx->flags |= CODEC_FLAG_EMU_EDGE; -#endif } #endif diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 9f7774613c..8e88a77820 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -2604,15 +2604,8 @@ static int stream_component_open(VideoState *is, int stream_index) } av_codec_set_lowres(avctx, stream_lowres); -#if FF_API_EMU_EDGE - if(stream_lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE; -#endif if (fast) avctx->flags2 |= AV_CODEC_FLAG2_FAST; -#if FF_API_EMU_EDGE - if(codec->capabilities & AV_CODEC_CAP_DR1) - avctx->flags |= CODEC_FLAG_EMU_EDGE; -#endif opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index], codec); if (!av_dict_get(opts, "threads", NULL, 0)) |