OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f2eca8d
)
avcodec/hevc_refs: fix h/vshift calculation in ff_hevc_output_frame()
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 19 Oct 2013 22:41:00 +0000
(
00:41
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 19 Oct 2013 22:41:00 +0000
(
00:41
+0200)
Fixes CID1108577
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc_refs.c
patch
|
blob
|
history
diff --git
a/libavcodec/hevc_refs.c
b/libavcodec/hevc_refs.c
index
9392a5a
..
2cf6860
100644
(file)
--- a/
libavcodec/hevc_refs.c
+++ b/
libavcodec/hevc_refs.c
@@
-184,8
+184,8
@@
int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush)
return ret;
for (j = 0; j < 3; j++) {
- int hshift = (
i
> 0) ? desc->log2_chroma_w : 0;
- int vshift = (
i
> 0) ? desc->log2_chroma_h : 0;
+ int hshift = (
j
> 0) ? desc->log2_chroma_w : 0;
+ int vshift = (
j
> 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;