summaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorJun Zhao <barryjzhao@tencent.com>2019-06-15 16:19:18 +0800
committerJun Zhao <barryjzhao@tencent.com>2019-11-04 10:22:11 +0800
commit8f7a043609554fd5e6917afeaed5d95bca420859 (patch)
tree93a1d3219165afd7aae333993618bad6ea323e9c /libavformat
parenta8ec0685ac1cfbeb0e87f47b86d4f0b5cf75d745 (diff)
downloadffmpeg-streaming-8f7a043609554fd5e6917afeaed5d95bca420859.zip
ffmpeg-streaming-8f7a043609554fd5e6917afeaed5d95bca420859.tar.gz
lavf/mpegtsenc: fix logic check error
fix the logic check error fix #6751 Reviewed-by: Andriy Gelman <andriy.gelman@gmail.com> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mpegtsenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 0678657..9f8f171 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1642,7 +1642,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
} while (p < buf_end && (state & 0x7e) != 2*35 &&
(state & 0x7e) >= 2*32);
- if ((state & 0x7e) < 2*16 && (state & 0x7e) >= 2*24)
+ if ((state & 0x7e) < 2*16 || (state & 0x7e) >= 2*24)
extradd = 0;
if ((state & 0x7e) != 2*35) { // AUD NAL
data = av_malloc(pkt->size + 7 + extradd);
OpenPOWER on IntegriCloud