summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorJason Garrett-Glaser <darkshikari@gmail.com>2011-01-10 23:42:45 +0000
committerJason Garrett-Glaser <darkshikari@gmail.com>2011-01-10 23:42:45 +0000
commit09fffe9bd4588330cbf6f6805b45c2b79c68ed99 (patch)
treed62cd0ea23fdd4d22fdf2706908536c581665a9a /libavcodec/h264.c
parent74093bb5936571bf2813781ff7628ac9ffed4467 (diff)
downloadffmpeg-09fffe9bd4588330cbf6f6805b45c2b79c68ed99.tar.gz
H.264: fix grayscale decoding with explicit wpred
Originally committed as revision 26306 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 318c1c8355..7c47cfbeb7 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1371,7 +1371,8 @@ static int pred_weight_table(H264Context *h){
h->use_weight= 0;
h->use_weight_chroma= 0;
h->luma_log2_weight_denom= get_ue_golomb(&s->gb);
- h->chroma_log2_weight_denom= get_ue_golomb(&s->gb);
+ if(CHROMA)
+ h->chroma_log2_weight_denom= get_ue_golomb(&s->gb);
luma_def = 1<<h->luma_log2_weight_denom;
chroma_def = 1<<h->chroma_log2_weight_denom;