[FFmpeg-cvslog] webmdashenc: Fix UTCTiming Element
ffmpeg | branch: master | Vignesh Venkatasubramanian |
Mon Apr 27 16:26:34 2015 -0700| [b410c69fb66688f3e7c8bb40aca201079b206bd9] |
committer: Michael Niedermayer
webmdashenc: Fix UTCTiming Element
Remove the direct profile from UTCTiming element. Per DASH spec,
direct profile value should be the time at which the request was
made to the server and not the time at which the manifest was
written. So ffmpeg cannot write this value. This patch removes
the direct profile and write the UTCTiming element with the http
profile only if a URL is passed as a parameter. Update the fate
test to reflect this change.
Signed-off-by: Vignesh Venkatasubramanian
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b410c69fb66688f3e7c8bb40aca201079b206bd9
---
libavformat/webmdashenc.c | 10 +-
tests/ref/fate/webm-dash-manifest-live |3 ---
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c
index 1c63a5b..17df1b6 100644
--- a/libavformat/webmdashenc.c
+++ b/libavformat/webmdashenc.c
@@ -119,11 +119,11 @@ static void write_header(AVFormatContext *s)
avio_printf(s->pb, " timeShiftBufferDepth=\"PT%gS\"\n",
w->time_shift_buffer_depth);
avio_printf(s->pb, " minimumUpdatePeriod=\"PT%dS\"",
w->minimum_update_period);
avio_printf(s->pb, ">\n");
-avio_printf(s->pb, "pb, " schemeIdUri=\"%s\"\n",
-w->utc_timing_url ? "urn:mpeg:dash:utc:http-iso:2014" :
"urn:mpeg:dash:utc:direct:2012");
-avio_printf(s->pb, " value=\"%s\"/>\n",
-w->utc_timing_url ? w->utc_timing_url : gmt_iso);
+if (w->utc_timing_url) {
+avio_printf(s->pb, "pb, "
schemeIdUri=\"urn:mpeg:dash:utc:http-iso:2014\"\n");
+avio_printf(s->pb, " value=\"%s\"/>\n", w->utc_timing_url);
+}
}
}
diff --git a/tests/ref/fate/webm-dash-manifest-live
b/tests/ref/fate/webm-dash-manifest-live
index 91a1c1d..6df7f87 100644
--- a/tests/ref/fate/webm-dash-manifest-live
+++ b/tests/ref/fate/webm-dash-manifest-live
@@ -9,9 +9,6 @@
availabilityStartTime=""
timeShiftBufferDepth="PT7200S"
minimumUpdatePeriod="PT60S">
-
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] apedec: set s->samples only when init_frame_decoder succeeded
ffmpeg | branch: master | Andreas Cadhalpun
| Tue Apr 28 00:30:51 2015 +0200| [464c49155ce7ffc88ed39eb2511e7a75565c24be] |
committer: Michael Niedermayer
apedec: set s->samples only when init_frame_decoder succeeded
Otherwise range_start_decoding is not necessarily run and thus
ctx->rc.range still 0 in range_dec_normalize leading to an infinite
loop.
Signed-off-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=464c49155ce7ffc88ed39eb2511e7a75565c24be
---
libavcodec/apedec.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 536361c..ffd54c1 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -1461,13 +1461,13 @@ static int ape_decode_frame(AVCodecContext *avctx, void
*data,
nblocks);
return AVERROR_INVALIDDATA;
}
-s->samples = nblocks;
/* Initialize the frame decoder */
if (init_frame_decoder(s) < 0) {
av_log(avctx, AV_LOG_ERROR, "Error reading frame header\n");
return AVERROR_INVALIDDATA;
}
+s->samples = nblocks;
}
if (!s->data) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libavformat/webm_chunk: Write first audio packet.
ffmpeg | branch: master | Vignesh Venkatasubramanian |
Mon Apr 27 14:47:03 2015 -0700| [8ca170a78ab6e50f44d27d8a6b4ad7ba1ed81f0c] |
committer: Michael Niedermayer
libavformat/webm_chunk: Write first audio packet.
Fix a bug where the chunk muxer doesn't write the very first audio
packet (with pts == 0).
Signed-off-by: Vignesh Venkatasubramanian
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ca170a78ab6e50f44d27d8a6b4ad7ba1ed81f0c
---
libavformat/webm_chunk.c |3 ---
1 file changed, 3 deletions(-)
diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c
index 48ea6f0..6d3d5d6 100644
--- a/libavformat/webm_chunk.c
+++ b/libavformat/webm_chunk.c
@@ -201,9 +201,6 @@ static int webm_chunk_write_packet(AVFormatContext *s,
AVPacket *pkt)
}
}
-if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && pkt->pts == 0) {
-goto fail;
-}
ret = oc->oformat->write_packet(oc, pkt);
if (ret < 0)
goto fail;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/hevc: Remove current_sps
ffmpeg | branch: master | Michael Niedermayer | Mon Apr 27
23:51:09 2015 +0200| [0e7444f6e400b16282f6349e3c53bcb72e6e2ad9] | committer:
Michael Niedermayer
avcodec/hevc: Remove current_sps
The variable should not be needed anymore
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e7444f6e400b16282f6349e3c53bcb72e6e2ad9
---
libavcodec/hevc.c|9 -
libavcodec/hevc.h|2 --
libavcodec/hevc_parser.c |1 -
libavcodec/hevc_ps.c |7 +--
4 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 544854f..f950349 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -3218,8 +3218,6 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx)
s->pps = NULL;
s->vps = NULL;
-av_buffer_unref(&s->current_sps);
-
av_freep(&s->sh.entry_point_offset);
av_freep(&s->sh.offset);
av_freep(&s->sh.size);
@@ -3340,13 +3338,6 @@ static int hevc_update_thread_context(AVCodecContext
*dst,
}
}
-av_buffer_unref(&s->current_sps);
-if (s0->current_sps) {
-s->current_sps = av_buffer_ref(s0->current_sps);
-if (!s->current_sps)
-return AVERROR(ENOMEM);
-}
-
if (s->sps != s0->sps)
if ((ret = set_sps(s, s0->sps, src->pix_fmt)) < 0)
return ret;
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index a4f7594..eecccb7 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -819,8 +819,6 @@ typedef struct HEVCContext {
AVBufferRef *sps_list[MAX_SPS_COUNT];
AVBufferRef *pps_list[MAX_PPS_COUNT];
-AVBufferRef *current_sps;
-
AVBufferPool *tab_mvf_pool;
AVBufferPool *rpl_tab_pool;
diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c
index 7076897..3c7c3c3 100644
--- a/libavcodec/hevc_parser.c
+++ b/libavcodec/hevc_parser.c
@@ -333,7 +333,6 @@ static void hevc_close(AVCodecParserContext *s)
for (i = 0; i < FF_ARRAY_ELEMS(h->pps_list); i++)
av_buffer_unref(&h->pps_list[i]);
-av_buffer_unref(&h->current_sps);
h->sps = NULL;
for (i = 0; i < h->nals_allocated; i++)
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 3d4f3e7..de81e01 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -88,12 +88,7 @@ static void remove_sps(HEVCContext *s, int id)
if (s->pps_list[i] && ((HEVCPPS*)s->pps_list[i]->data)->sps_id ==
id)
remove_pps(s, i);
-if (s->sps_list[id] && s->sps == (HEVCSPS*)s->sps_list[id]->data) {
-av_buffer_unref(&s->current_sps);
-s->current_sps = av_buffer_ref(s->sps_list[id]);
-if (!s->current_sps)
-s->sps = NULL;
-}
+av_assert0(!(s->sps_list[id] && s->sps ==
(HEVCSPS*)s->sps_list[id]->data));
}
av_buffer_unref(&s->sps_list[id]);
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 117771f web/security: add CVE-2015-3417
The branch, master has been updated via 117771f7ef094731eb23e7ac736a0eee0d11f3f7 (commit) from 1615f46107d6bcbe4ce0a9285c42ffd1c6ea90f0 (commit) - Log - commit 117771f7ef094731eb23e7ac736a0eee0d11f3f7 Author: Michael Niedermayer AuthorDate: Mon Apr 27 18:48:10 2015 +0200 Commit: Michael Niedermayer CommitDate: Mon Apr 27 18:48:10 2015 +0200 web/security: add CVE-2015-3417 diff --git a/src/security b/src/security index 87d85b1..581b526 100644 --- a/src/security +++ b/src/security @@ -10,6 +10,14 @@ Fixes following vulnerabilities: CVE-2015-3395, dfce316c12d867400fb132ff5094163e3d2634a3 / f7e1367f58263593e6cee3c282f7277d7ee9d553 +2.6 + +Fixes following vulnerabilities: + + +CVE-2015-3417, e8714f6f93d1a32f4e4655209960afcf4c185214 + + FFmpeg 2.5 @@ -38,6 +46,7 @@ Fixes following vulnerabilities: CVE-2014-9602, 991ef3a67ec66b3f4e11752eff48b6ae925a1ba7 / 93a5a16f136d095d23610f57bdad10ba88120fba CVE-2014-9603, b850b01533b8e153d9dde5014d2a0e8f366fdd31 / 3030fb7e0d41836f8add6399e9a7c7b740b48bfd CVE-2014-9604, 3d1972d182c009472a5172c9d9272c3454301a44 / 3881606240953b9275a247a1c98a567f3c44890f +CVE-2015-3417, 0663aab1d9affd79f699462063412aa6d705a2ef / e8714f6f93d1a32f4e4655209960afcf4c185214 2.5 @@ -85,6 +94,7 @@ Fixes following vulnerabilities: CVE-2014-9603, 195e8ecacc8b81b71e86d283ce7742bbdc230826 / 3030fb7e0d41836f8add6399e9a7c7b740b48bfd CVE-2014-9604, 64fdce7802632801d36f9d3973a065e0e011c154 / 3881606240953b9275a247a1c98a567f3c44890f +CVE-2015-3417, a9c77e5c227bc8c23778def2f7180b987d4da5c5 / e8714f6f93d1a32f4e4655209960afcf4c185214 2.4.4 @@ -127,6 +137,7 @@ CVE-2014-9316, 6c63eb59099e7096aad3c15a1dab62afc87b / 0eecf40935b22644e6cd74 CVE-2014-9317, 1bfd23d2c934db2f7fc20c1e4de5404869555991 / 79ceaf827be0b070675d4cd0a55c3386542defd8 CVE-2014-9318, e0822b147f25e56c65b48b7717eaa68f249346eb / 1d3a3b9f8907625b361420d48fe05716859620ff CVE-2014-9319, 87d0339d67669b9cca9142603c4b00ee10d833c5 / ea38e5a6b75706477898eb1e6582d667dbb9946c +CVE-2015-3417, 3353a00d58e26806c7e693d0a524987aac722d90 / e8714f6f93d1a32f4e4655209960afcf4c185214 2.3.5 @@ -202,6 +213,7 @@ Fixes following vulnerabilities: CVE-2014-9603, 7279be7c75c38547994466b6f95bc3cadb05238b / 3030fb7e0d41836f8add6399e9a7c7b740b48bfd CVE-2014-9604, c351cd720a0c870dc09a15b6e191188978349bc7 / 3881606240953b9275a247a1c98a567f3c44890f +CVE-2015-3417, 25dc978bb1b50a94fae5e66779c87ece76bde323 / e8714f6f93d1a32f4e4655209960afcf4c185214 2.2.11 @@ -268,6 +280,7 @@ Fixes following vulnerabilities: CVE-2014-9603, 96981b092c0971ac4c572692141cda87f5371989 / 3030fb7e0d41836f8add6399e9a7c7b740b48bfd CVE-2014-9604, ba99e90357c97f7845f1d463f73d9a4a7e77d78a / 3881606240953b9275a247a1c98a567f3c44890f +CVE-2015-3417, 84bc2cea237725de468f53dbba6d53140fae21c5 / e8714f6f93d1a32f4e4655209960afcf4c185214 2.1.6 @@ -448,6 +461,7 @@ CVE-2014-9316, 6c28673cb3648d49117c6bfa4ed89ead157b1c22 / 0eecf40935b22644e6cd74 CVE-2014-9603, 0da0d7754e745d066f845da499383ff86d2ce04f / 3030fb7e0d41836f8add6399e9a7c7b740b48bfd CVE-2014-9604, ece0c9c4b04257d8ba3689987251f44421b1ead7 / 3881606240953b9275a247a1c98a567f3c44890f CVE-2014-9317, d723f92dbf6778a17a9e69c56386d357d75d3245 / 79ceaf827be0b070675d4cd0a55c3386542defd8 +CVE-2015-3417, a9c0f905aa3bd5342ffa3a0e9d54172d4c541903 / e8714f6f93d1a32f4e4655209960afcf4c185214 1.2.9 --- Summary of changes: src/security | 14 ++ 1 files changed, 14 insertions(+), 0 deletions(-) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] tests/subtitles: fix microdvd crlf in ref
ffmpeg | branch: master | Clément Bœsch | Sun Apr 26 19:30:39
2015 +0200| [11d29277d6484fc1728278b4f211475376f30256] | committer: Clément
Bœsch
tests/subtitles: fix microdvd crlf in ref
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11d29277d6484fc1728278b4f211475376f30256
---
tests/ref/fate/sub-microdvd | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/ref/fate/sub-microdvd b/tests/ref/fate/sub-microdvd
index 4a2e00c..d2170bc 100644
--- a/tests/ref/fate/sub-microdvd
+++ b/tests/ref/fate/sub-microdvd
@@ -7,12 +7,12 @@ PlayResY: 288
[V4+ Styles]
Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour,
OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY,
Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR,
MarginV, Encoding
Style: Default,Comic Sans
MS,30,&H123456,&H123456,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0
-
-[Events]
-Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
-Dialogue:
0,0:00:40.00,0:00:52.00,Default,,0,0,0,,{\c&H345678&}foo{\c}\N{\c&HABCDEF&}bar{\c}\Nbla
-Dialogue: 0,0:00:52.00,0:00:56.00,Default,,0,0,0,,{\u1}{\s1}{\i1}{\b1}italic
bold underline strike{\s0}{\u0}\Nitalic bold no-underline no-strike
-Dialogue: 0,0:00:56.00,0:01:00.00,Default,,0,0,0,,back to
+
+[Events]
+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
+Dialogue:
0,0:00:40.00,0:00:52.00,Default,,0,0,0,,{\c&H345678&}foo{\c}\N{\c&HABCDEF&}bar{\c}\Nbla
+Dialogue: 0,0:00:52.00,0:00:56.00,Default,,0,0,0,,{\u1}{\s1}{\i1}{\b1}italic
bold underline strike{\s0}{\u0}\Nitalic bold no-underline no-strike
+Dialogue: 0,0:00:56.00,0:01:00.00,Default,,0,0,0,,back to
Dialogue: 0,0:01:00.00,0:01:04.00,Default,,0,0,0,,the future
Dialogue: 0,0:01:20.00,0:01:24.92,Default,,0,0,0,,{\pos(10,20)}Some more crazy
stuff
Dialogue: 0,0:02:14.00,0:02:15.60,Default,,0,0,0,,this subtitle...
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] tests: make sure subtitles tests are run with a rawdiff
ffmpeg | branch: master | Clément Bœsch | Sun Apr 26 19:29:40
2015 +0200| [2879a4ecb9c31430dae75af79696ef4f94ce6b46] | committer: Clément
Bœsch
tests: make sure subtitles tests are run with a rawdiff
This will test properly CRLF with make fate, make fate-subtitles and any
make fate-sub-* test. Before this commit, the rawdiff was triggered only
by make fate-subtitles.
Also make sure fate-sub-* only match the tests relying on fmtstdout
command, to at least avoid failing on MingW. See
https://ffmpeg.org/pipermail/ffmpeg-devel/2015-April/172395.html
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2879a4ecb9c31430dae75af79696ef4f94ce6b46
---
tests/fate/subtitles.mak |7 ---
tests/ref/fate/{sub-movtextenc => binsub-movtextenc} |0
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak
index 53cd4cb..07d886a 100644
--- a/tests/fate/subtitles.mak
+++ b/tests/fate/subtitles.mak
@@ -13,8 +13,8 @@ fate-sub-microdvd-remux: CMD = fmtstdout microdvd -i
$(TARGET_SAMPLES)/sub/Micro
FATE_SUBTITLES_ASS-$(call DEMDEC, MOV, MOVTEXT) += fate-sub-movtext
fate-sub-movtext: CMD = fmtstdout ass -i
$(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4
-FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-sub-movtextenc
-fate-sub-movtextenc: CMD = md5 -i
$(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f
mp4 -flags +bitexact -movflags frag_keyframe+empty_moov
+FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-binsub-movtextenc
+fate-binsub-movtextenc: CMD = md5 -i
$(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f
mp4 -flags +bitexact -movflags frag_keyframe+empty_moov
FATE_SUBTITLES_ASS-$(call DEMDEC, MPL2, MPL2) += fate-sub-mpl2
fate-sub-mpl2: CMD = fmtstdout ass -i
$(TARGET_SAMPLES)/sub/MPL2_capability_tester.txt
@@ -64,6 +64,7 @@ fate-sub-charenc: CMD = fmtstdout ass -sub_charenc cp1251 -i
$(TARGET_SAMPLES)/s
FATE_SUBTITLES-$(call ENCMUX, ASS, ASS) += $(FATE_SUBTITLES_ASS-yes)
FATE_SUBTITLES += $(FATE_SUBTITLES-yes)
+fate-sub-%: CMP = rawdiff
+
FATE_SAMPLES_FFMPEG += $(FATE_SUBTITLES)
-fate-subtitles: CMP = rawdiff
fate-subtitles: $(FATE_SUBTITLES)
diff --git a/tests/ref/fate/sub-movtextenc b/tests/ref/fate/binsub-movtextenc
similarity index 100%
rename from tests/ref/fate/sub-movtextenc
rename to tests/ref/fate/binsub-movtextenc
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Adapt libavcodec/tableprint_vlc.h to the av_dlog -> ff_dlog change.
ffmpeg | branch: master | Alexis Ballier | Mon Apr 27 17:33:01 2015 +0200| [6fe2afaa71270c8030c4afde72608668e42fed67] | committer: Michael Niedermayer Adapt libavcodec/tableprint_vlc.h to the av_dlog -> ff_dlog change. This fixes the build with --enable-hardcoded-tables that was broken since [8f7b022c8c2f40bf8ddfd90778a4c91424d3a8e5]. Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6fe2afaa71270c8030c4afde72608668e42fed67 --- libavcodec/tableprint_vlc.h |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/tableprint_vlc.h b/libavcodec/tableprint_vlc.h index aa4c82b..7f46f2e 100644 --- a/libavcodec/tableprint_vlc.h +++ b/libavcodec/tableprint_vlc.h @@ -26,7 +26,7 @@ #define FFMPEG_CONFIG_H #define AVUTIL_LOG_H #define av_log(a, ...) -#define av_dlog(a, ...) +#define ff_dlog(a, ...) #define AVUTIL_MEM_H #define av_malloc(s) NULL #define av_malloc_array(a, b) NULL @@ -34,6 +34,7 @@ #define av_free(p) #define av_freep(p) #define AVCODEC_AVCODEC_H +#define AVCODEC_INTERNAL_H #include "tableprint.h" #include "get_bits.h" #include "mathtables.c" ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 1615f46 web/security: fix mismatching html tags
The branch, master has been updated via 1615f46107d6bcbe4ce0a9285c42ffd1c6ea90f0 (commit) from 93ca5a8ebe45b8d3769cb2004dbeff5577b8f68c (commit) - Log - commit 1615f46107d6bcbe4ce0a9285c42ffd1c6ea90f0 Author: Michael Niedermayer AuthorDate: Mon Apr 27 17:27:19 2015 +0200 Commit: Michael Niedermayer CommitDate: Mon Apr 27 17:27:19 2015 +0200 web/security: fix mismatching html tags diff --git a/src/security b/src/security index dd995cb..87d85b1 100644 --- a/src/security +++ b/src/security @@ -62,7 +62,7 @@ CVE-2014-9319, ea38e5a6b75706477898eb1e6582d667dbb9946c FFmpeg 2.4 -2.4.8 +2.4.8 Fixes following vulnerabilities: @@ -70,7 +70,7 @@ Fixes following vulnerabilities: CVE-2015-3395, 539172c85b13796fe5ce2a7482f436b6e9b33cf6 / f7e1367f58263593e6cee3c282f7277d7ee9d553 -2.4.7 +2.4.7 Fixes following vulnerabilities: @@ -78,7 +78,7 @@ Fixes following vulnerabilities: CVE-2015-1872, 08822122987f563b72dff77b019ae3f98b0acebb / fabbfaa095660982cc0bc63242c459561fa37037 -2.4.5 +2.4.5 Fixes following vulnerabilities: @@ -87,7 +87,7 @@ CVE-2014-9603, 195e8ecacc8b81b71e86d283ce7742bbdc230826 / 3030fb7e0d41836f8add63 CVE-2014-9604, 64fdce7802632801d36f9d3973a065e0e011c154 / 3881606240953b9275a247a1c98a567f3c44890f -2.4.4 +2.4.4 Fixes following vulnerabilities: @@ -98,7 +98,7 @@ CVE-2014-9318, 12e064d6c2ae66bd501872ab4fc2033588419f85 / 1d3a3b9f8907625b361420 CVE-2014-9319, 4b8f3c5bf34e517f8a50c5b5152985b8ef725c6b / ea38e5a6b75706477898eb1e6582d667dbb9946c -2.4.2 +2.4.2 Fixes following vulnerabilities: --- Summary of changes: src/security | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 93ca5a8 web/security: add CVE-2015-3395
The branch, master has been updated via 93ca5a8ebe45b8d3769cb2004dbeff5577b8f68c (commit) from 90499a114eee28cf340668dbfb6c09a484a54fb6 (commit) - Log - commit 93ca5a8ebe45b8d3769cb2004dbeff5577b8f68c Author: Michael Niedermayer AuthorDate: Mon Apr 27 17:25:21 2015 +0200 Commit: Michael Niedermayer CommitDate: Mon Apr 27 17:25:21 2015 +0200 web/security: add CVE-2015-3395 diff --git a/src/security b/src/security index 2d07237..dd995cb 100644 --- a/src/security +++ b/src/security @@ -1,7 +1,26 @@ Please report vulnerabilities to mailto:ffmpeg-secur...@ffmpeg.org";>ffmpeg-secur...@ffmpeg.org +FFmpeg 2.6 + +2.6.2 + +Fixes following vulnerabilities: + + +CVE-2015-3395, dfce316c12d867400fb132ff5094163e3d2634a3 / f7e1367f58263593e6cee3c282f7277d7ee9d553 + + + FFmpeg 2.5 +2.5.6 + +Fixes following vulnerabilities: + + +CVE-2015-3395, a376ef4a17edb947bbcf54171daa914bd4585a4f / f7e1367f58263593e6cee3c282f7277d7ee9d553 + + 2.5.4 Fixes following vulnerabilities: @@ -43,6 +62,14 @@ CVE-2014-9319, ea38e5a6b75706477898eb1e6582d667dbb9946c FFmpeg 2.4 +2.4.8 + +Fixes following vulnerabilities: + + +CVE-2015-3395, 539172c85b13796fe5ce2a7482f436b6e9b33cf6 / f7e1367f58263593e6cee3c282f7277d7ee9d553 + + 2.4.7 Fixes following vulnerabilities: @@ -152,6 +179,14 @@ CVE-2014-4610, d6af26c55c1ea30f85a7d9edbc373f53be1743ee FFmpeg 2.2 +2.2.15 + +Fixes following vulnerabilities: + + +CVE-2015-3395, 33877cd276f99fc234b5269d9d158ce71e50d363 / f7e1367f58263593e6cee3c282f7277d7ee9d553 + + 2.2.13 Fixes following vulnerabilities: --- Summary of changes: src/security | 35 +++ 1 files changed, 35 insertions(+), 0 deletions(-) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] makefile: add Loongson-3 support
ffmpeg | branch: master | ZhouXiaoyong | Mon Apr 27 10:40:29 2015 +0800| [4a7b50679db3a3c902d459745f2f1f622e27eab6] | committer: Michael Niedermayer makefile: add Loongson-3 support Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a7b50679db3a3c902d459745f2f1f622e27eab6 --- Makefile |2 +- arch.mak |1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fe0e02f..fd59628 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS \ ALTIVEC-OBJS MMX-OBJS YASM-OBJS \ MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSPR1-OBJS MSA-OBJS \ - OBJS SLIBOBJS HOSTOBJS TESTOBJS + LOONGSON3-OBJS OBJS SLIBOBJS HOSTOBJS TESTOBJS define RESET $(1) := diff --git a/arch.mak b/arch.mak index 39f2917..bda3ae1 100644 --- a/arch.mak +++ b/arch.mak @@ -8,6 +8,7 @@ OBJS-$(HAVE_MIPSFPU) += $(MIPSFPU-OBJS)$(MIPSFPU-OBJS-yes) OBJS-$(HAVE_MIPSDSPR1) += $(MIPSDSPR1-OBJS) $(MIPSDSPR1-OBJS-yes) OBJS-$(HAVE_MIPSDSPR2) += $(MIPSDSPR2-OBJS) $(MIPSDSPR2-OBJS-yes) OBJS-$(HAVE_MSA) += $(MSA-OBJS)$(MSA-OBJS-yes) +OBJS-$(HAVE_LOONGSON3) += $(LOONGSON3-OBJS) $(LOONGSON3-OBJS-yes) OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS) $(ALTIVEC-OBJS-yes) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/ppc/fdctdsp: POWER LE support in ff_fdct_altivec() delete macros VEC_FMERGEH() VEC_FMERGEL(), they where wrong
ffmpeg | branch: master | Rong Yan | Mon Apr 27 03:29:51
2015 +| [8a03d428f1759a7d3af505ab747662747360ea60] | committer: Michael
Niedermayer
avcodec/ppc/fdctdsp: POWER LE support in ff_fdct_altivec() delete macros
VEC_FMERGEH() VEC_FMERGEL(), they where wrong
GCC tool had a bug of PPC intrinsic interpret, which has been fixed in GCC
4.9.1. This bug lead to
errors in two of our previous patches. We found this when we update our GCC
tools to 4.9.1 and by
reading the related info on GCC website. We fix our previous error in two
separate commits
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a03d428f1759a7d3af505ab747662747360ea60
---
libavcodec/ppc/fdctdsp.c | 86 +-
1 file changed, 39 insertions(+), 47 deletions(-)
diff --git a/libavcodec/ppc/fdctdsp.c b/libavcodec/ppc/fdctdsp.c
index 80f1366..40f4c6c 100644
--- a/libavcodec/ppc/fdctdsp.c
+++ b/libavcodec/ppc/fdctdsp.c
@@ -78,14 +78,6 @@ static const vector float fdctconsts[3] = {
#define LD_WA vec_splat(cnsts2, 2)
#define LD_WB vec_splat(cnsts2, 3)
-#if HAVE_BIGENDIAN
-#define VEC_FMERGEH(a, b) vec_mergeh(a, b)
-#define VEC_FMERGEL(a, b) vec_mergel(a, b)
-#else
-#define VEC_FMERGEH(a, b) vec_mergel(b, a)
-#define VEC_FMERGEL(a, b) vec_mergeh(b, a)
-#endif
-
#define FDCTROW(b0, b1, b2, b3, b4, b5, b6, b7) /* {{{ */ \
x0 = vec_add(b0, b7); /* x0 = b0 + b7; */ \
x7 = vec_sub(b0, b7); /* x7 = b0 - b7; */ \
@@ -393,45 +385,45 @@ void ff_fdct_altivec(int16_t *block)
/* }}} */
/* 8x8 matrix transpose (vector float[8][2]) {{{ */
-x0 = VEC_FMERGEL(b00, b20);
-x1 = VEC_FMERGEH(b00, b20);
-x2 = VEC_FMERGEL(b10, b30);
-x3 = VEC_FMERGEH(b10, b30);
-
-b00 = VEC_FMERGEH(x1, x3);
-b10 = VEC_FMERGEL(x1, x3);
-b20 = VEC_FMERGEH(x0, x2);
-b30 = VEC_FMERGEL(x0, x2);
-
-x4 = VEC_FMERGEL(b41, b61);
-x5 = VEC_FMERGEH(b41, b61);
-x6 = VEC_FMERGEL(b51, b71);
-x7 = VEC_FMERGEH(b51, b71);
-
-b41 = VEC_FMERGEH(x5, x7);
-b51 = VEC_FMERGEL(x5, x7);
-b61 = VEC_FMERGEH(x4, x6);
-b71 = VEC_FMERGEL(x4, x6);
-
-x0 = VEC_FMERGEL(b01, b21);
-x1 = VEC_FMERGEH(b01, b21);
-x2 = VEC_FMERGEL(b11, b31);
-x3 = VEC_FMERGEH(b11, b31);
-
-x4 = VEC_FMERGEL(b40, b60);
-x5 = VEC_FMERGEH(b40, b60);
-x6 = VEC_FMERGEL(b50, b70);
-x7 = VEC_FMERGEH(b50, b70);
-
-b40 = VEC_FMERGEH(x1, x3);
-b50 = VEC_FMERGEL(x1, x3);
-b60 = VEC_FMERGEH(x0, x2);
-b70 = VEC_FMERGEL(x0, x2);
-
-b01 = VEC_FMERGEH(x5, x7);
-b11 = VEC_FMERGEL(x5, x7);
-b21 = VEC_FMERGEH(x4, x6);
-b31 = VEC_FMERGEL(x4, x6);
+x0 = vec_mergel(b00, b20);
+x1 = vec_mergeh(b00, b20);
+x2 = vec_mergel(b10, b30);
+x3 = vec_mergeh(b10, b30);
+
+b00 = vec_mergeh(x1, x3);
+b10 = vec_mergel(x1, x3);
+b20 = vec_mergeh(x0, x2);
+b30 = vec_mergel(x0, x2);
+
+x4 = vec_mergel(b41, b61);
+x5 = vec_mergeh(b41, b61);
+x6 = vec_mergel(b51, b71);
+x7 = vec_mergeh(b51, b71);
+
+b41 = vec_mergeh(x5, x7);
+b51 = vec_mergel(x5, x7);
+b61 = vec_mergeh(x4, x6);
+b71 = vec_mergel(x4, x6);
+
+x0 = vec_mergel(b01, b21);
+x1 = vec_mergeh(b01, b21);
+x2 = vec_mergel(b11, b31);
+x3 = vec_mergeh(b11, b31);
+
+x4 = vec_mergel(b40, b60);
+x5 = vec_mergeh(b40, b60);
+x6 = vec_mergel(b50, b70);
+x7 = vec_mergeh(b50, b70);
+
+b40 = vec_mergeh(x1, x3);
+b50 = vec_mergel(x1, x3);
+b60 = vec_mergeh(x0, x2);
+b70 = vec_mergel(x0, x2);
+
+b01 = vec_mergeh(x5, x7);
+b11 = vec_mergel(x5, x7);
+b21 = vec_mergeh(x4, x6);
+b31 = vec_mergel(x4, x6);
/* }}} */
FDCTCOL(b00, b10, b20, b30, b40, b50, b60, b70);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] swscale/ppc/swscale_altivec.c: POWER LE support in yuv2planeX_8() delete macro GET_VF() it was wrong
ffmpeg | branch: master | Rong Yan | Mon Apr 27 03:19:45
2015 +| [603c839398f89d3ef15c47530470fbb0051632c0] | committer: Michael
Niedermayer
swscale/ppc/swscale_altivec.c: POWER LE support in yuv2planeX_8() delete macro
GET_VF() it was wrong
GCC tool had a bug of PPC intrinsic interpret, which has been fixed in GCC
4.9.1. This bug lead to
errors in two of our previous patches. We found this when we update our GCC
tools to 4.9.1 and by
reading the related info on GCC website. We fix our previous error in two
separate commits
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=603c839398f89d3ef15c47530470fbb0051632c0
---
libswscale/ppc/swscale_altivec.c | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/libswscale/ppc/swscale_altivec.c b/libswscale/ppc/swscale_altivec.c
index 3034c72..af9fc88 100644
--- a/libswscale/ppc/swscale_altivec.c
+++ b/libswscale/ppc/swscale_altivec.c
@@ -40,19 +40,11 @@
ls = vec_perm(a, l2, c);\
a = l2;\
}
-#define GET_VF(a, b, c,d) {\
-a = vec_mergeh(c, d);\
-b = vec_mergel(c, d);\
-}
#else
#define GET_LS(a,b,c,s) {\
ls = a;\
a = vec_vsx_ld(((b) << 1) + 16, s);\
}
-#define GET_VF(a, b, c, d) {\
-a = vec_mergel(d, c);\
-b = vec_mergeh(d, c);\
-}
#endif
#define yuv2planeX_8(d1, d2, l1, src, x, perm, filter) do {\
@@ -61,7 +53,8 @@
vector signed int i1 = vec_mule(filter, ls);\
vector signed int i2 = vec_mulo(filter, ls);\
vector signed int vf1, vf2;\
-GET_VF(vf1, vf2, i1, i2);\
+vf1 = vec_mergeh(i1, i2);\
+vf2 = vec_mergel(i1, i2);\
d1 = vec_add(d1, vf1);\
d2 = vec_add(d2, vf2);\
} while (0)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
