summaryrefslogtreecommitdiff
path: root/ffplay.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-05-05 15:35:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-05-05 15:35:54 +0200
commit175714c0c34025d642f529af5809dcb48c5ceb0c (patch)
tree0bd522e3699f77a363c8ada66cbd9a339212cce0 /ffplay.c
parentb000b86e1dd03c4ff89cd63a6fa88fc280947c94 (diff)
downloadffmpeg-175714c0c34025d642f529af5809dcb48c5ceb0c.tar.gz
ffplay: set CODEC_FLAG_EMU_EDGE earlier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c5
1 files changed, 4 insertions, 1 deletions
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;