diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-01-20 15:22:09 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-01-21 17:54:09 +0100 |
| commit | e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d (patch) | |
| tree | aa242b0ecdfc9c98d112a22f1e517332c20290d9 /libavcodec/utils.c | |
| parent | 025fd76e1a2623c858d8c686a73cc30980a314b0 (diff) | |
| download | ffmpeg-e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d.tar.gz | |
lavc: do not force the emu edge flag
The default get_buffer2() implementation (and possibly some
user ones) does not allocate edges when this flag is set, which may
expose bugs in some decoders. Until the 10 release is out, it is safer
to remove this part.
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2e418ec46c..044413a50a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1091,11 +1091,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code ret = AVERROR(EINVAL); goto free_and_end; } - -#if FF_API_EMU_EDGE - /* force the emu edge flag on, since it's now always active */ - avctx->flags |= CODEC_FLAG_EMU_EDGE; -#endif } end: entangled_thread_counter--; |