diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:37:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:37:53 +0100 |
| commit | 9d945898523bb726b457a741ef0813ba209c92df (patch) | |
| tree | d341573a0b0db8f783d548537622cf25aa4bf412 | |
| parent | 99ba7ee0eba556cdc7484152d5a9b3a80b9fe6de (diff) | |
| parent | 9858a723cbcb206287fd0232d74c6a0991eecdc8 (diff) | |
| download | ffmpeg-9d945898523bb726b457a741ef0813ba209c92df.tar.gz | |
Merge commit '9858a723cbcb206287fd0232d74c6a0991eecdc8' into release/0.10
* commit '9858a723cbcb206287fd0232d74c6a0991eecdc8':
elbg: Fix an assert
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/elbg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/elbg.c b/libavcodec/elbg.c index ede863e9be..3af4d052dd 100644 --- a/libavcodec/elbg.c +++ b/libavcodec/elbg.c @@ -110,7 +110,7 @@ static int get_high_utility_cell(elbg_data *elbg) while (elbg->utility_inc[i] < r) i++; - assert(!elbg->cells[i]); + assert(elbg->cells[i]); return i; } |