[FFmpeg-cvslog] lavc/ccaption_dec: fix always true condition

Clément Bœsch git at videolan.org
Thu Jan 7 22:45:30 CET 2016


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Tue Jan  5 21:54:28 2016 +0100| [d64fe951c2ee8a85c615c33490889f45c4663862] | committer: Clément Bœsch

lavc/ccaption_dec: fix always true condition

No idea why this wasn't ever detected by a static analyzer.

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

 libavcodec/ccaption_dec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c
index 788e96a..8ee2c65 100644
--- a/libavcodec/ccaption_dec.c
+++ b/libavcodec/ccaption_dec.c
@@ -455,7 +455,7 @@ static int process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint8
     int ret = 0;
     if (hi == ctx->prev_cmd[0] && lo == ctx->prev_cmd[1]) {
         /* ignore redundant command */
-    } else if ( (hi == 0x10 && (lo >= 0x40 || lo <= 0x5f)) ||
+    } else if ( (hi == 0x10 && (lo >= 0x40 && lo <= 0x5f)) ||
               ( (hi >= 0x11 && hi <= 0x17) && (lo >= 0x40 && lo <= 0x7f) ) ) {
         handle_pac(ctx, hi, lo);
     } else if ( ( hi == 0x11 && lo >= 0x20 && lo <= 0x2f ) ||



More information about the ffmpeg-cvslog mailing list