[SCM] libav/experimental: matroskadec: Fix a double negation typo

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:03:41 UTC 2014


The following commit has been merged in the experimental branch:
commit 98569d89638efc325042bd0081e9a02181afdafa
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Oct 20 16:58:33 2012 +0200

    matroskadec: Fix a double negation typo
    
    This typo has existed since this code was added in c16582579.
    Newer versions of clang pointed out that this comparison always
    was true (since the result of the negation is either 0 or 1, while
    AVDISCARD_ALL has the value 48).
    
    Signed-off-by: Martin Storsjö <martin at martin.st>

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index d5bc923..22108ad 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2560,7 +2560,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index,
         tracks[i].audio.buf_timecode   = AV_NOPTS_VALUE;
         tracks[i].end_timecode         = 0;
         if (tracks[i].type == MATROSKA_TRACK_TYPE_SUBTITLE &&
-            !tracks[i].stream->discard != AVDISCARD_ALL) {
+            tracks[i].stream->discard != AVDISCARD_ALL) {
             index_sub = av_index_search_timestamp(
                 tracks[i].stream, st->index_entries[index].timestamp,
                 AVSEEK_FLAG_BACKWARD);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list