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 /ffmpeg_opt.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 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index c5e6624a16..42d23277df 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -674,9 +674,11 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) case AVMEDIA_TYPE_VIDEO: if(!ist->dec) ist->dec = avcodec_find_decoder(dec->codec_id); +#if FF_API_EMU_EDGE if (av_codec_get_lowres(dec)) { dec->flags |= CODEC_FLAG_EMU_EDGE; } +#endif ist->resample_height = ist->dec_ctx->height; ist->resample_width = ist->dec_ctx->width; |