summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-25 22:46:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-25 22:46:17 +0100
commita3b3562b4753479f6619d49934d1ed31493c22ef (patch)
tree80dbc15ffe64da89f3c6208615a29d48e0c52942 /libavcodec
parent9e794d103c0bddee3d3b46c390b5d3b30435fa1d (diff)
vc1dec: fix 10l typo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vc1dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index f1efa105aa..90373d53b2 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -5719,7 +5719,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
//av_log(s->avctx, AV_LOG_INFO, "Consumed %i/%i bits\n", get_bits_count(&s->gb), s->gb.size_in_bits);
// if (get_bits_count(&s->gb) > buf_size * 8)
// return -1;
- if(s->error_occurred & s->pict_type == AV_PICTURE_TYPE_B)
+ if(s->error_occurred && s->pict_type == AV_PICTURE_TYPE_B)
goto err;
ff_er_frame_end(s);
}