diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 11:59:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 15:32:15 +0100 |
| commit | 2c4f5736962a7ae6a484017eddc07452cc4c39c0 (patch) | |
| tree | 07d755336c46e5a51135ba8e061490dffec53df9 /libavcodec/hevc_refs.c | |
| parent | e877455ff98a655fb95aff7574b6d269bd712110 (diff) | |
| download | ffmpeg-2c4f5736962a7ae6a484017eddc07452cc4c39c0.tar.gz | |
libavcodec/hevc: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_refs.c')
| -rw-r--r-- | libavcodec/hevc_refs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 1fe7b10d3c..118688f55f 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -23,9 +23,9 @@ #include "libavutil/pixdesc.h" -#include "hevc.h" #include "internal.h" #include "thread.h" +#include "hevc.h" void ff_hevc_unref_frame(HEVCContext *s, HEVCFrame *frame, int flags) { @@ -157,7 +157,7 @@ int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush) do { int nb_output = 0; int min_poc = INT_MAX; - int i, j, min_idx, ret; + int i, min_idx, ret; for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { HEVCFrame *frame = &s->DPB[i]; @@ -188,12 +188,12 @@ int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush) if (ret < 0) return ret; - for (j = 0; j < 3; j++) { - int hshift = (j > 0) ? desc->log2_chroma_w : 0; - int vshift = (j > 0) ? desc->log2_chroma_h : 0; + for (i = 0; i < 3; i++) { + int hshift = (i > 0) ? desc->log2_chroma_w : 0; + int vshift = (i > 0) ? desc->log2_chroma_h : 0; int off = ((frame->window.left_offset >> hshift) << pixel_shift) + - (frame->window.top_offset >> vshift) * dst->linesize[j]; - dst->data[j] += off; + (frame->window.top_offset >> vshift) * dst->linesize[i]; + dst->data[i] += off; } av_log(s->avctx, AV_LOG_DEBUG, "Output frame with POC %d.\n", frame->poc); |