[FFmpeg-cvslog] avformat/xmv: Discard remainder of packet on error
ffmpeg | branch: release/2.4 | Michael Niedermayer| Fri Nov 6 02:13:36 2015 +0100| [76950e5247334dee45bdc73af7a2f134fea4da02] | committer: Michael Niedermayer avformat/xmv: Discard remainder of packet on error Fixes infinite loop Fixes: 9c48ae2680c5f23bca3d20ff0f325fd8/asan_generic_4c254d_1374_993f1e5967dd6f844b8d72f978ce2a6c.pss Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 79c4a338e4b2bf0bc6f81c9f455994f673a92f78) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76950e5247334dee45bdc73af7a2f134fea4da02 --- libavformat/xmv.c |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/xmv.c b/libavformat/xmv.c index cee2c80..1410bff 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -552,8 +552,11 @@ static int xmv_read_packet(AVFormatContext *s, result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1); } -if (result) +if (result) { +xmv->current_stream = 0; +xmv->video.current_frame = xmv->video.frame_count; return result; +} /* Increase our counters */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/xmv: Discard remainder of packet on error
ffmpeg | branch: release/2.5 | Michael Niedermayer| Fri Nov 6 02:13:36 2015 +0100| [fd7bb09e8a33b30d0d4f8542b266f6ada7051cc2] | committer: Michael Niedermayer avformat/xmv: Discard remainder of packet on error Fixes infinite loop Fixes: 9c48ae2680c5f23bca3d20ff0f325fd8/asan_generic_4c254d_1374_993f1e5967dd6f844b8d72f978ce2a6c.pss Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 79c4a338e4b2bf0bc6f81c9f455994f673a92f78) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd7bb09e8a33b30d0d4f8542b266f6ada7051cc2 --- libavformat/xmv.c |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/xmv.c b/libavformat/xmv.c index cee2c80..1410bff 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -552,8 +552,11 @@ static int xmv_read_packet(AVFormatContext *s, result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1); } -if (result) +if (result) { +xmv->current_stream = 0; +xmv->video.current_frame = xmv->video.frame_count; return result; +} /* Increase our counters */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/xmv: Discard remainder of packet on error
ffmpeg | branch: release/2.6 | Michael Niedermayer| Fri Nov 6 02:13:36 2015 +0100| [36b65f1c50f47e95c21da9b772068a0e2b06] | committer: Michael Niedermayer avformat/xmv: Discard remainder of packet on error Fixes infinite loop Fixes: 9c48ae2680c5f23bca3d20ff0f325fd8/asan_generic_4c254d_1374_993f1e5967dd6f844b8d72f978ce2a6c.pss Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 79c4a338e4b2bf0bc6f81c9f455994f673a92f78) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36b65f1c50f47e95c21da9b772068a0e2b06 --- libavformat/xmv.c |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/xmv.c b/libavformat/xmv.c index 06c070c..14d007a 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -554,8 +554,11 @@ static int xmv_read_packet(AVFormatContext *s, result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1); } -if (result) +if (result) { +xmv->current_stream = 0; +xmv->video.current_frame = xmv->video.frame_count; return result; +} /* Increase our counters */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/xmv: Discard remainder of packet on error
ffmpeg | branch: release/2.7 | Michael Niedermayer| Fri Nov 6 02:13:36 2015 +0100| [bcedc2b0f0e47edc2670200c91a49b36e4c07257] | committer: Michael Niedermayer avformat/xmv: Discard remainder of packet on error Fixes infinite loop Fixes: 9c48ae2680c5f23bca3d20ff0f325fd8/asan_generic_4c254d_1374_993f1e5967dd6f844b8d72f978ce2a6c.pss Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 79c4a338e4b2bf0bc6f81c9f455994f673a92f78) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bcedc2b0f0e47edc2670200c91a49b36e4c07257 --- libavformat/xmv.c |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/xmv.c b/libavformat/xmv.c index 06c070c..14d007a 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -554,8 +554,11 @@ static int xmv_read_packet(AVFormatContext *s, result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1); } -if (result) +if (result) { +xmv->current_stream = 0; +xmv->video.current_frame = xmv->video.frame_count; return result; +} /* Increase our counters */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/xmv: Discard remainder of packet on error
ffmpeg | branch: release/2.8 | Michael Niedermayer| Fri Nov 6 02:13:36 2015 +0100| [b93a8bd838ddf4097f2cc7e6410e91dbaa7c727e] | committer: Michael Niedermayer avformat/xmv: Discard remainder of packet on error Fixes infinite loop Fixes: 9c48ae2680c5f23bca3d20ff0f325fd8/asan_generic_4c254d_1374_993f1e5967dd6f844b8d72f978ce2a6c.pss Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 79c4a338e4b2bf0bc6f81c9f455994f673a92f78) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b93a8bd838ddf4097f2cc7e6410e91dbaa7c727e --- libavformat/xmv.c |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/xmv.c b/libavformat/xmv.c index 06c070c..14d007a 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -554,8 +554,11 @@ static int xmv_read_packet(AVFormatContext *s, result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1); } -if (result) +if (result) { +xmv->current_stream = 0; +xmv->video.current_frame = xmv->video.frame_count; return result; +} /* Increase our counters */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/xmv: Discard remainder of packet on error
ffmpeg | branch: master | Michael Niedermayer| Fri Nov 6 02:13:36 2015 +0100| [79c4a338e4b2bf0bc6f81c9f455994f673a92f78] | committer: Michael Niedermayer avformat/xmv: Discard remainder of packet on error Fixes infinite loop Fixes: 9c48ae2680c5f23bca3d20ff0f325fd8/asan_generic_4c254d_1374_993f1e5967dd6f844b8d72f978ce2a6c.pss Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79c4a338e4b2bf0bc6f81c9f455994f673a92f78 --- libavformat/xmv.c |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/xmv.c b/libavformat/xmv.c index 06c070c..14d007a 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -554,8 +554,11 @@ static int xmv_read_packet(AVFormatContext *s, result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1); } -if (result) +if (result) { +xmv->current_stream = 0; +xmv->video.current_frame = xmv->video.frame_count; return result; +} /* Increase our counters */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog