diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 15:58:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 15:59:33 +0200 |
| commit | 2278146a0ca06ab88cc4885f9f7b1d56eff9873f (patch) | |
| tree | b0802fc0abc39fd68190c43ee70844c835eb79c6 | |
| parent | b703322059668be14816f1cf6cc721a6792cbf3d (diff) | |
| parent | d1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574 (diff) | |
| download | ffmpeg-2278146a0ca06ab88cc4885f9f7b1d56eff9873f.tar.gz | |
Merge commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574'
* commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574':
hevc: reorder loops
Conflicts:
libavcodec/hevc.c
See: eca1957c4cbee66a0b1f3dcabaffe68d61885f16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 3170d8496e..6291dc63a7 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -1693,7 +1693,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, x_pu = x0 >> s->sps->log2_min_pu_size; y_pu = y0 >> s->sps->log2_min_pu_size; - for (j = 0; j < nPbH >> s->sps->log2_min_pu_size; j++) + for(j = 0; j < nPbH >> s->sps->log2_min_pu_size; j++) for (i = 0; i < nPbW >> s->sps->log2_min_pu_size; i++) tab_mvf[(y_pu + j) * min_pu_width + x_pu + i] = current_mv; } |