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/snowenc.c | |
| parent | d658e04337c590043190718ec4a8137d3e8216b9 (diff) | |
| parent | b3739599bda740ac12d3dde31a331b744df99123 (diff) | |
Merge commit 'b3739599bda740ac12d3dde31a331b744df99123'
* commit 'b3739599bda740ac12d3dde31a331b744df99123':
lavc: Drop deprecated emu edge functionality
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/snowenc.c')
| -rw-r--r-- | libavcodec/snowenc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 0d800b9f49..3ffa701093 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1622,11 +1622,7 @@ 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] -#if FF_API_EMU_EDGE - && !(s->avctx->flags&CODEC_FLAG_EMU_EDGE) -#endif - ) { + if (s->current_picture->data[0]) { int w = s->avctx->width; int h = s->avctx->height; |