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/mjpegenc.c | |
| parent | 1e50f953fac7fb3af907a24f9fc301fa80f441b4 (diff) | |
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/mjpegenc.c')
| -rw-r--r-- | libavcodec/mjpegenc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index ee0b16ee0b..f15de58c2c 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -224,9 +224,11 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift, &chroma_v_shift); +#if FF_API_EMU_EDGE //CODEC_FLAG_EMU_EDGE have to be cleared if(s->avctx->flags & CODEC_FLAG_EMU_EDGE) return AVERROR(EINVAL); +#endif if ((avctx->height & 15) && avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) { av_log(avctx, AV_LOG_ERROR, |