diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-08-17 12:25:39 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2015-08-28 14:40:59 -0400 |
| commit | 2fb593dcb90c157a183e9e01e42405fcca73a8b8 (patch) | |
| tree | 1f221abf08ceac421b4e7393fe9e0f9192b25949 /ffplay.c | |
| parent | 1e50f953fac7fb3af907a24f9fc301fa80f441b4 (diff) | |
| download | ffmpeg-2fb593dcb90c157a183e9e01e42405fcca73a8b8.tar.gz | |
Put remaining pieces of CODEC_FLAG_EMU_EDGE under FF_API_EMU_EDGE.
The amv one probably looks suspicious, but since it's an intra-only
codec, I couldn't possibly imagine what it would use the edge for,
and the vsynth fate result doesn't change, so it's probably OK.
Diffstat (limited to 'ffplay.c')
| -rw-r--r-- | ffplay.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -2577,11 +2577,15 @@ 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)) |