diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 22:04:31 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 22:04:31 +0300 |
| commit | 7b550c5f84f21ce883e86bc91f16093641d5dc85 (patch) | |
| tree | 5cffe208a3e3c1577e0be2efe49310745d889100 /libavcodec/wmv2dec.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/wmv2dec.c')
| -rw-r--r-- | libavcodec/wmv2dec.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 20dbee5703..261d291c97 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -460,10 +460,6 @@ 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; |