[FFmpeg-cvslog] vc1dec: fix 10l typo

Michael Niedermayer git at videolan.org
Fri Nov 25 23:45:51 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 25 22:46:17 2011 +0100| [a3b3562b4753479f6619d49934d1ed31493c22ef] | committer: Michael Niedermayer

vc1dec: fix 10l typo

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3b3562b4753479f6619d49934d1ed31493c22ef
---

 libavcodec/vc1dec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index f1efa10..90373d5 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);
     }



More information about the ffmpeg-cvslog mailing list