From 02c986a8d66e29ab52d1489273ef4d6f8fd4aac0 Mon Sep 17 00:00:00 2001 From: Oded Shimon Date: Mon, 4 Feb 2008 10:45:32 +0000 Subject: [PATCH] Fix intented algo in syncpoint writing before keyframes in NUT muxer Originally committed as revision 11855 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/nutenc.c | 2 +- tests/libav.regression.ref | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index a8a431fc22..51c7633ae7 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -462,7 +462,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt){ if(1LL<<(20+3*nut->header_count) <= url_ftell(bc)) write_headers(nut, bc); - if(key_frame && !!(nus->last_flags & FLAG_KEY)) + if(key_frame && !(nus->last_flags & FLAG_KEY)) store_sp= 1; if(pkt->size + 30/*FIXME check*/ + url_ftell(bc) >= nut->last_syncpoint_pos + nut->max_distance) diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index ac69ea1932..fba7ed4daa 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -30,8 +30,8 @@ f8ad5bd78f4d012a8ce9570aa395ac54 *./tests/data/b-libav.flv 2ba41cf880aa5cb87e8a08fdb735398d *./tests/data/b-libav.gxf 814640 ./tests/data/b-libav.gxf ./tests/data/b-libav.gxf CRC=0xa376c09e -5b6d03cfa8ccb701bec3c0f0e562e0da *./tests/data/b-libav.nut -330100 ./tests/data/b-libav.nut +5489961f19ae94683d134d8108d646c8 *./tests/data/b-libav.nut +329785 ./tests/data/b-libav.nut ./tests/data/b-libav.nut CRC=0x400c29e9 43238b15f1012aa27536c2be20bb2383 *./tests/data/b-libav.mkv 329854 ./tests/data/b-libav.mkv