diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 16:04:31 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 16:04:31 -0300 |
| commit | 7b550c5f84f21ce883e86bc91f16093641d5dc85 (patch) | |
| tree | 5cffe208a3e3c1577e0be2efe49310745d889100 /libavcodec/mjpegenc.c | |
| parent | d658e04337c590043190718ec4a8137d3e8216b9 (diff) | |
| parent | b3739599bda740ac12d3dde31a331b744df99123 (diff) | |
| download | ffmpeg-streaming-7b550c5f84f21ce883e86bc91f16093641d5dc85.zip ffmpeg-streaming-7b550c5f84f21ce883e86bc91f16093641d5dc85.tar.gz | |
Merge commit 'b3739599bda740ac12d3dde31a331b744df99123'
* commit 'b3739599bda740ac12d3dde31a331b744df99123':
lavc: Drop deprecated emu edge functionality
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/mjpegenc.c')
| -rw-r--r-- | libavcodec/mjpegenc.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index e6cdaf6..d2fcb8e 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -358,12 +358,6 @@ 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, "Heights which are not a multiple of 16 might fail with some decoders, " |
