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:
6ab793c
)
avcodec/utils: add GBRP16 to avcodec_align_dimensions2()
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 24 Aug 2014 21:33:40 +0000
(23:33 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 28 Nov 2014 17:44:37 +0000
(18:44 +0100)
Fixes Ticket3869
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
3fe9e7be4c70c8fccdcd56fd19276e668cfb7de8
)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c
patch
|
blob
|
history
diff --git
a/libavcodec/utils.c
b/libavcodec/utils.c
index
c343bf1
..
8b50c45
100644
(file)
--- a/
libavcodec/utils.c
+++ b/
libavcodec/utils.c
@@
-327,6
+327,8
@@
void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
case AV_PIX_FMT_GBRP12BE:
case AV_PIX_FMT_GBRP14LE:
case AV_PIX_FMT_GBRP14BE:
+ case AV_PIX_FMT_GBRP16LE:
+ case AV_PIX_FMT_GBRP16BE:
w_align = 16; //FIXME assume 16 pixel per macroblock
h_align = 16 * 2; // interlaced needs 2 macroblocks height
break;