diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-02 18:24:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 22:55:39 +0200 |
| commit | 81d1fcf37d4bdba58705f0541ebdab890d80ee4a (patch) | |
| tree | 435843390b6004e67079ce275bda46343f29b10f /libavcodec/error_resilience.c | |
| parent | a8bc175dd9cec09c1cbdc6e5e3bf8f59170162da (diff) | |
| download | ffmpeg-81d1fcf37d4bdba58705f0541ebdab890d80ee4a.tar.gz | |
avcodec: add option to make is_intra_more_likely() from error concealment return "no"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 670e592b8c..7bb7860f91 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -686,6 +686,9 @@ static int is_intra_more_likely(ERContext *s) if (!s->last_pic.f || !s->last_pic.f->data[0]) return 1; // no previous frame available -> use spatial prediction + if (s->avctx->error_concealment & FF_EC_FAVOR_INTER) + return 0; + undamaged_count = 0; for (i = 0; i < s->mb_num; i++) { const int mb_xy = s->mb_index2xy[i]; |