From 175714c0c34025d642f529af5809dcb48c5ceb0c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 5 May 2011 15:35:54 +0200 Subject: [PATCH] ffplay: set CODEC_FLAG_EMU_EDGE earlier Signed-off-by: Michael Niedermayer --- ffplay.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ffplay.c b/ffplay.c index 7574b510d5..e57161fc21 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1644,7 +1644,7 @@ static int input_init(AVFilterContext *ctx, const char *args, void *opaque) codec->opaque = ctx; if((codec->codec->capabilities & CODEC_CAP_DR1) ) { - codec->flags |= CODEC_FLAG_EMU_EDGE; + av_assert0(codec->flags & CODEC_FLAG_EMU_EDGE); priv->use_dr1 = 1; codec->get_buffer = input_get_buffer; codec->release_buffer = input_release_buffer; @@ -2206,6 +2206,9 @@ static int stream_component_open(VideoState *is, int stream_index) set_context_opts(avctx, avcodec_opts[avctx->codec_type], 0, codec); + if(codec->capabilities & CODEC_CAP_DR1) + avctx->flags |= CODEC_FLAG_EMU_EDGE; + if (!codec || avcodec_open(avctx, codec) < 0) return -1;