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 /libavcodec/snowenc.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 'libavcodec/snowenc.c')
| -rw-r--r-- | libavcodec/snowenc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index beb25c13c3..9b5a488148 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1610,7 +1610,11 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, s->lambda = 0; }//else keep previous frame's qlog until after motion estimation - if (s->current_picture->data[0] && !(s->avctx->flags&CODEC_FLAG_EMU_EDGE)) { + if (s->current_picture->data[0] +#if FF_API_EMU_EDGE + && !(s->avctx->flags&CODEC_FLAG_EMU_EDGE) +#endif + ) { int w = s->avctx->width; int h = s->avctx->height; |