diff options
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpegenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/snowenc.c | 6 | ||||
| -rw-r--r-- | libavcodec/wmv2dec.c | 2 |
3 files changed, 9 insertions, 1 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, 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; diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index f8128dc52a..cd17358287 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -453,7 +453,9 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) Wmv2Context *const w = avctx->priv_data; int ret; +#if FF_API_EMU_EDGE avctx->flags |= CODEC_FLAG_EMU_EDGE; +#endif if ((ret = ff_msmpeg4_decode_init(avctx)) < 0) return ret; |