[FFmpeg-cvslog] fate: add more vc2 encoder tests

2018-07-18 Thread James Darnley 
ffmpeg | branch: master | James Darnley  | Mon Jan 29 
17:40:00 2018 +0100| [088b07427dfe05de998609fe214017ebdb703a63] | committer: 
James Darnley

fate: add more vc2 encoder tests

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=088b07427dfe05de998609fe214017ebdb703a63
---

 tests/fate/vcodec.mak  | 24 
 tests/ref/vsynth/vsynth1-vc2-t5_3  |  4 
 tests/ref/vsynth/vsynth1-vc2-thaar |  4 
 tests/ref/vsynth/vsynth2-vc2-t5_3  |  4 
 tests/ref/vsynth/vsynth2-vc2-thaar |  4 
 tests/ref/vsynth/vsynth_lena-vc2-t5_3  |  4 
 tests/ref/vsynth/vsynth_lena-vc2-thaar |  4 
 7 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index bbcf25d72a..da6da9e09b 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -38,17 +38,25 @@ FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p  
\
 
 FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p vc2-420p10 vc2-420p12 \
   vc2-422p vc2-422p10 vc2-422p12 \
-  vc2-444p vc2-444p10 vc2-444p12
-fate-vsynth1-vc2-%:  FMT  = mov
-fate-vsynth1-vc2-%:  ENCOPTS = -pix_fmt 
yuv$(@:fate-vsynth1-vc2-%=%) \
+  vc2-444p vc2-444p10 vc2-444p12 \
+  vc2-thaar vc2-t5_3
+fate-vsynth1-vc2-4%: FMT  = mov
+fate-vsynth1-vc2-4%: ENCOPTS = -pix_fmt 
yuv$(@:fate-vsynth1-vc2-%=%) \
-c:v vc2 -frames 5 -strict -1
-fate-vsynth2-vc2-%:  FMT  = mov
-fate-vsynth2-vc2-%:  ENCOPTS = -pix_fmt 
yuv$(@:fate-vsynth2-vc2-%=%) \
+fate-vsynth2-vc2-4%: FMT  = mov
+fate-vsynth2-vc2-4%: ENCOPTS = -pix_fmt 
yuv$(@:fate-vsynth2-vc2-%=%) \
-c:v vc2 -frames 5 -strict -1
-fate-vsynth_lena-vc2-%:  FMT  = mov
-fate-vsynth_lena-vc2-%:  ENCOPTS = -pix_fmt 
yuv$(@:fate-vsynth_lena-vc2-%=%) \
+fate-vsynth_lena-vc2-4%: FMT  = mov
+fate-vsynth_lena-vc2-4%: ENCOPTS = -pix_fmt 
yuv$(@:fate-vsynth_lena-vc2-%=%) \
-c:v vc2 -frames 5 -strict -1
 
+fate-vsynth1-vc2-t%: FMT = mov
+fate-vsynth1-vc2-t%: ENCOPTS = -pix_fmt yuv422p10 -c:v vc2 -frames 
5 -strict -1 -wavelet_type $(@:fate-vsynth1-vc2-t%=%)
+fate-vsynth2-vc2-t%: FMT = mov
+fate-vsynth2-vc2-t%: ENCOPTS = -pix_fmt yuv422p10 -c:v vc2 -frames 
5 -strict -1 -wavelet_type $(@:fate-vsynth2-vc2-t%=%)
+fate-vsynth_lena-vc2-t%: FMT = mov
+fate-vsynth_lena-vc2-t%: ENCOPTS = -pix_fmt yuv422p10 -c:v vc2 -frames 
5 -strict -1 -wavelet_type $(@:fate-vsynth_lena-vc2-t%=%)
+
 fate-vsynth%-dnxhd-720p: ENCOPTS = -s hd720 -b 90M  \
-pix_fmt yuv422p -frames 5 -qmax 8
 fate-vsynth%-dnxhd-720p: FMT = dnxhd
@@ -434,7 +442,7 @@ FATE_VSYNTH_LENA = $(FATE_VCODEC:%=fate-vsynth_lena-%)
 RESIZE_OFF   = dnxhd-720p dnxhd-720p-rd dnxhd-720p-10bit dnxhd-1080i \
dv dv-411 dv-50 avui snow snow-hpel snow-ll vc2-420p \
vc2-420p10 vc2-420p12 vc2-422p vc2-422p10 vc2-422p12 \
-   vc2-444p vc2-444p10 vc2-444p12
+   vc2-444p vc2-444p10 vc2-444p12 vc2-thaar vc2-t5_3
 # Incorrect parameters - usually size or color format restrictions
 INC_PAR_OFF  = cinepak h261 h261-trellis h263 h263p h263-obmc msvideo1 \
roqvideo rv10 rv20 y41p qtrlegray
diff --git a/tests/ref/vsynth/vsynth1-vc2-t5_3 
b/tests/ref/vsynth/vsynth1-vc2-t5_3
new file mode 100644
index 00..543f632c23
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-vc2-t5_3
@@ -0,0 +1,4 @@
+a5c80a091e7c3021ab9d5b854b4c653f *tests/data/fate/vsynth1-vc2-t5_3.mov
+1604316 tests/data/fate/vsynth1-vc2-t5_3.mov
+f35dd1c1df4726bb1d75d95e321b0698 *tests/data/fate/vsynth1-vc2-t5_3.out.rawvideo
+stddev:1.88 PSNR: 42.61 MAXDIFF:   23 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-vc2-thaar 
b/tests/ref/vsynth/vsynth1-vc2-thaar
new file mode 100644
index 00..4c1f50f40d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-vc2-thaar
@@ -0,0 +1,4 @@
+62bcccb2981c4b79b635a0199a7fafb1 *tests/data/fate/vsynth1-vc2-thaar.mov
+1717724 tests/data/fate/vsynth1-vc2-thaar.mov
+f35dd1c1df4726bb1d75d95e321b0698 
*tests/data/fate/vsynth1-vc2-thaar.out.rawvideo
+stddev:1.88 PSNR: 42.61 MAXDIFF:   23 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-vc2-t5_3 
b/tests/ref/vsynth/vsynth2-vc2-t5_3
new file mode 100644
index 00..c4ac50d5a9
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-vc2-t5_3
@@ -0,0 +1,4 @@
+654f04ae4f5947f0d354025fee1f37e0 *tests/data/fate/vsynth2-vc2-t5_3.mov
+1335772 tests/data/fate/vsynth2-vc2-t5_3

[FFmpeg-cvslog] avcodec/dvbsub_parser: Do not discard data

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Fri 
Jul  6 13:02:19 2018 +0200| [1809f1cda9563ff4451203e0c852afe12f684b80] | 
committer: Michael Niedermayer

avcodec/dvbsub_parser: Do not discard data

May fix: oss fuzz issue 9220

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1809f1cda9563ff4451203e0c852afe12f684b80
---

 libavcodec/dvbsub_parser.c | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c
index e77b9655cc..8ced3c4c34 100644
--- a/libavcodec/dvbsub_parser.c
+++ b/libavcodec/dvbsub_parser.c
@@ -57,6 +57,7 @@ static int dvbsub_parse(AVCodecParserContext *s,
 DVBSubParseContext *pc = s->priv_data;
 uint8_t *p, *p_end;
 int i, len, buf_pos = 0;
+int out_size = 0;
 
 ff_dlog(avctx, "DVB parse packet pts=%"PRIx64", lpts=%"PRIx64", 
cpts=%"PRIx64":\n",
 s->pts, s->last_pts, s->cur_frame_pts[s->cur_frame_start_index]);
@@ -71,8 +72,8 @@ static int dvbsub_parse(AVCodecParserContext *s,
 if (i % 16 != 0)
 ff_dlog(avctx, "\n");
 
-*poutbuf = NULL;
-*poutbuf_size = 0;
+*poutbuf  = buf;
+*poutbuf_size = buf_size;
 
 s->fetch_timestamp = 1;
 
@@ -89,7 +90,7 @@ static int dvbsub_parse(AVCodecParserContext *s,
 
 if (buf_size < 2 || buf[0] != 0x20 || buf[1] != 0x00) {
 ff_dlog(avctx, "Bad packet header\n");
-return -1;
+return buf_size;
 }
 
 buf_pos = 2;
@@ -113,9 +114,9 @@ static int dvbsub_parse(AVCodecParserContext *s,
 }
 
 if (buf_size - buf_pos + pc->packet_index > PARSE_BUF_SIZE)
-return -1;
+return buf_size;
 
-/* if not currently in a packet, discard data */
+/* if not currently in a packet, pass data */
 if (pc->in_packet == 0)
 return buf_size;
 
@@ -135,7 +136,7 @@ static int dvbsub_parse(AVCodecParserContext *s,
 
 if (len + 6 <= p_end - p)
 {
-*poutbuf_size += len + 6;
+out_size += len + 6;
 
 p += len + 6;
 } else
@@ -159,9 +160,10 @@ static int dvbsub_parse(AVCodecParserContext *s,
 }
 }
 
-if (*poutbuf_size > 0)
+if (out_size > 0)
 {
 *poutbuf = pc->packet_buf;
+*poutbuf_size = out_size;
 pc->packet_start = *poutbuf_size;
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/tscc: Move reget buffer to after decoding

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Jul 15 13:52:50 2018 +0200| [91578f5798d36467e8e2138eada5ce26c12b4e1e] | 
committer: Michael Niedermayer

avcodec/tscc: Move reget buffer to after decoding

reget buffer can be time consuming, theres no need to do it if failures
occur

Testcase: 
9010/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TSCC_fuzzer-6042614817095680

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91578f5798d36467e8e2138eada5ce26c12b4e1e
---

 libavcodec/tscc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c
index cb86b584c1..f891932342 100644
--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@@ -70,9 +70,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, 
int *got_frame,
 AVFrame *frame = c->frame;
 int ret;
 
-if ((ret = ff_reget_buffer(avctx, frame)) < 0)
-return ret;
-
 ret = inflateReset(&c->zstream);
 if (ret != Z_OK) {
 av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", ret);
@@ -89,6 +86,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, 
int *got_frame,
 return AVERROR_UNKNOWN;
 }
 
+if ((ret = ff_reget_buffer(avctx, frame)) < 0)
+return ret;
 
 if (ret != Z_DATA_ERROR) {
 bytestream2_init(&c->gb, c->decomp_buf,

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/lagarith: Remove redundant varianble init

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Jul 15 13:32:09 2018 +0200| [706c9beaead70ee861e183338e136382b17ade05] | 
committer: Michael Niedermayer

avcodec/lagarith: Remove redundant varianble init

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=706c9beaead70ee861e183338e136382b17ade05
---

 libavcodec/lagarith.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c
index ba2da2eeb2..510a6ff2d6 100644
--- a/libavcodec/lagarith.c
+++ b/libavcodec/lagarith.c
@@ -541,7 +541,7 @@ static int lag_decode_frame(AVCodecContext *avctx,
 LagarithContext *l = avctx->priv_data;
 ThreadFrame frame = { .f = data };
 AVFrame *const p  = data;
-uint8_t frametype = 0;
+uint8_t frametype;
 uint32_t offset_gu = 0, offset_bv = 0, offset_ry = 9;
 uint32_t offs[4];
 uint8_t *srcs[4], *dst;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/cfhd: Use bytestream2 for peaks

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat 
Jul 14 00:26:08 2018 +0200| [4a657acaefd599f3971e88419516a7f4ece00e53] | 
committer: Michael Niedermayer

avcodec/cfhd: Use bytestream2 for peaks

This fixes out of array accesses
No testcase known

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a657acaefd599f3971e88419516a7f4ece00e53
---

 libavcodec/cfhd.c | 10 +-
 libavcodec/cfhd.h |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
index ef5ebe42c5..76838f0869 100644
--- a/libavcodec/cfhd.c
+++ b/libavcodec/cfhd.c
@@ -79,7 +79,7 @@ static void init_peak_table_defaults(CFHDContext *s)
 {
 s->peak.level  = 0;
 s->peak.offset = 0;
-s->peak.base   = NULL;
+memset(&s->peak.base, 0, sizeof(s->peak.base));
 }
 
 static void init_frame_defaults(CFHDContext *s)
@@ -133,7 +133,7 @@ static inline void peak_table(int16_t *band, Peak *peak, 
int length)
 int i;
 for (i = 0; i < length; i++)
 if (abs(band[i]) > peak->level)
-band[i] = *(peak->base++);
+band[i] = bytestream2_get_le16(&peak->base);
 }
 
 static inline void process_alpha(int16_t *alpha, int width)
@@ -537,16 +537,16 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, 
int *got_frame,
 } else if (tag == -75) {
 s->peak.offset &= ~0x;
 s->peak.offset |= (data & 0x);
-s->peak.base= (int16_t *) gb.buffer;
+s->peak.base= gb;
 s->peak.level   = 0;
 } else if (tag == -76) {
 s->peak.offset &= 0x;
 s->peak.offset |= (data & 0xU)<<16;
-s->peak.base= (int16_t *) gb.buffer;
+s->peak.base= gb;
 s->peak.level   = 0;
 } else if (tag == -74 && s->peak.offset) {
 s->peak.level = data;
-s->peak.base += s->peak.offset / 2 - 2;
+bytestream2_seek(&s->peak.base, s->peak.offset - 4, SEEK_CUR);
 } else
 av_log(avctx, AV_LOG_DEBUG,  "Unknown tag %i data %x\n", tag, 
data);
 
diff --git a/libavcodec/cfhd.h b/libavcodec/cfhd.h
index 7cd251fca7..4f2c82d8bc 100644
--- a/libavcodec/cfhd.h
+++ b/libavcodec/cfhd.h
@@ -26,6 +26,7 @@
 #include "libavutil/avassert.h"
 
 #include "avcodec.h"
+#include "bytestream.h"
 #include "get_bits.h"
 #include "vlc.h"
 
@@ -71,7 +72,7 @@ typedef struct Plane {
 typedef struct Peak {
 int level;
 int offset;
-const int16_t *base;
+GetByteContext base;
 } Peak;
 
 typedef struct CFHDContext {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Update for 4.0.2

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: release/4.0 | Michael Niedermayer  | 
Wed Jul 18 14:04:51 2018 +0200| [0a155c57bd8eb92ccaf7f5857dc6ab276d235846] | 
committer: Michael Niedermayer

Update for 4.0.2

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a155c57bd8eb92ccaf7f5857dc6ab276d235846
---

 Changelog| 47 +++
 RELEASE  |  2 +-
 doc/Doxyfile |  2 +-
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 6481918bf2..e4be13807f 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,53 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
+version 4.0.2:
+- avcodec/dvdsub_parser: Allocate input padding
+- avcodec/dvdsub_parser: Init output buf/size
+- avcodec/dirac_dwt_template: Fix signedness regression in interleave()
+- avformat/mov: Simplify last element computation in mov_estimate_video_delay()
+- avformat/mov: Break out of inner loop early in mov_estimate_video_delay()
+- avformat/mov: Eliminate variable buf_size from mov_estimate_video_delay()
+- avformat/mov: remove modulo operations from mov_estimate_video_delay()
+- avformat/movenc: Write version 2 of audio atom if channels is not known
+- swresample/arm: rename labels to fix xcode build error
+- avformat/movenc: Check input sample count
+- avcodec/mjpegdec: Check for odd progressive RGB
+- avcodec/vp8_parser: Do not leave data/size uninitialized
+- avformat/mms: Add missing chunksize check
+- avformat/pva: Check for EOF before retrying in read_part_of_packet()
+- avformat/rmdec: Do not pass mime type in rm_read_multi() to 
ff_rm_read_mdpr_codecdata()
+- avformat/asfdec_o: Check size_bmp more fully
+- avformat/mxfdec: Fix av_log context
+- avcodec/mpeg4videodec: Check for bitstream end in read_quant_matrix_ext()
+- avcodec/indeo4: Check for end of bitstream in decode_mb_info()
+- avcodec/ac3dec: Check channel_map index
+- avcodec/mpeg4videodec: Remove use of FF_PROFILE_MPEG4_SIMPLE_STUDIO as 
indicator of studio profile
+- avcodec/shorten: Fix undefined addition in shorten_decode_frame()
+- avcodec/shorten: Fix undefined integer overflow
+- avcodec/jpeg2000dec: Fixes invalid shifts in 
jpeg2000_decode_packets_po_iteration()
+- avcodec/jpeg2000dec: Check that there are enough bytes for all tiles
+- avformat/movenc: Use mov->fc consistently for av_log()
+- avcodec/mpeg4videodec: Check read profile before setting it
+- avformat/movenc: Do not pass AVCodecParameters in avpriv_request_sample
+- avcodec/ac3_parser: Check init_get_bits8() for failure
+- avformat/movenc: Check that frame_types other than 
EAC3_FRAME_TYPE_INDEPENDENT have a supported substream id
+- avcodec/dpx: Check elements in 12bps planar path
+- avcodec/escape124: Fix spelling errors in comment
+- avcodec/ra144: Fix integer overflow in ff_eval_refl()
+- avcodec/cscd: Check output buffer size for lzo.
+- avcodec/escape124: Check buf_size against num_superblocks
+- avcodec/h264_parser: Reduce needed history for parsing mb index
+- avcodec/magicyuv: Check bits left in flags&1 branch
+- avcodec/mjpegdec: Check for end of bitstream in ljpeg_decode_rgb_scan()
+- ffmpeg: fix -stream_loop with multiple inputs
+- ffmpeg: factorize input thread creation and destruction
+- avformat/mpegts: parse large PMTs with multiple tables
+- Revert "avcodec/mediacodecdec: wait on first frame after input buffers are 
full"
+- avcodec/videotoolboxenc: fix invalid session on iOS
+- avcodec/videotoolboxenc: split initialization
+- avcodec/videotoolboxenc: fix mutex/cond leak in error path
+
 version 4.0.1:
 - avcodec/aacdec_fixed: Fix undefined integer overflow in 
apply_independent_coupling_fixed()
 - avcodec/dirac_dwt_template: Fix undefined behavior in interleave()
diff --git a/RELEASE b/RELEASE
index 1454f6ed4b..4d54daddb6 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-4.0.1
+4.0.2
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 9f23e5c1d0..9413e6fc65 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME   = FFmpeg
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = 4.0.1
+PROJECT_NUMBER = 4.0.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Update for 3.4.4

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: release/3.4 | Michael Niedermayer  | 
Wed Jul 18 15:07:41 2018 +0200| [8df2c7dde6af3e748447ac313947388e6887178a] | 
committer: Michael Niedermayer

Update for 3.4.4

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8df2c7dde6af3e748447ac313947388e6887178a
---

 Changelog| 8 
 RELEASE  | 2 +-
 doc/Doxyfile | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index c9ddfd2ba8..5560069441 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,14 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
+version 3.4.4:
+- avcodec/dvdsub_parser: Allocate input padding
+- avcodec/dvdsub_parser: Init output buf/size
+- avcodec/dirac_dwt_template: Fix signedness regression in interleave()
+- avformat/movenc: Write version 2 of audio atom if channels is not known
+- swresample/arm: rename labels to fix xcode build error
+- avcodec/imgconvert: fix possible null pointer dereference
+
 version 3.4.3:
 - avformat/movenc: Check input sample count
 - avcodec/mjpegdec: Check for odd progressive RGB
diff --git a/RELEASE b/RELEASE
index 6cb9d3dd0d..f9892605c7 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-3.4.3
+3.4.4
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 969e5f89db..883d9a5680 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME   = FFmpeg
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = 3.4.3
+PROJECT_NUMBER = 3.4.4
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dirac_dwt_template: Fix signedness regression in interleave()

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: release/3.4 | Michael Niedermayer  | 
Fri Jul 13 18:33:08 2018 +0200| [15990a43b023c87148658e271476b7a19ccde8ea] | 
committer: Michael Niedermayer

avcodec/dirac_dwt_template: Fix signedness regression in interleave()

Found-by: 
Tested-by: James Darnley 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 181435a4de6e38e0a15ddaf16de9a157ef41cb18)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15990a43b023c87148658e271476b7a19ccde8ea
---

 libavcodec/dirac_dwt_template.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dirac_dwt_template.c b/libavcodec/dirac_dwt_template.c
index 528fc7e9e7..2369c8d15b 100644
--- a/libavcodec/dirac_dwt_template.c
+++ b/libavcodec/dirac_dwt_template.c
@@ -57,8 +57,8 @@ static av_always_inline void RENAME(interleave)(TYPE *dst, 
TYPE *src0, TYPE *src
 {
 int i;
 for (i = 0; i < w2; i++) {
-dst[2*i  ] = (src0[i] + (unsigned)add) >> shift;
-dst[2*i+1] = (src1[i] + (unsigned)add) >> shift;
+dst[2*i  ] = ((int)(src0[i] + (unsigned)add)) >> shift;
+dst[2*i+1] = ((int)(src1[i] + (unsigned)add)) >> shift;
 }
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] swresample/arm: rename labels to fix xcode build error

2018-07-18 Thread Rahul Chaudhry 
ffmpeg | branch: release/3.4 | Rahul Chaudhry  | 
Fri Apr 27 13:49:52 2018 -0700| [a8c5c71a0489b2b391af6d356385e5718af97d8f] | 
committer: Michael Niedermayer

swresample/arm: rename labels to fix xcode build error

Signed-off-by: Michael Niedermayer 
(cherry picked from commit e84212b78e00df17799e01be1e153a073eb8f689)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8c5c71a0489b2b391af6d356385e5718af97d8f
---

 libswresample/arm/audio_convert_neon.S | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libswresample/arm/audio_convert_neon.S 
b/libswresample/arm/audio_convert_neon.S
index 7729514701..085d50aafa 100644
--- a/libswresample/arm/audio_convert_neon.S
+++ b/libswresample/arm/audio_convert_neon.S
@@ -22,7 +22,7 @@
 #include "libavutil/arm/asm.S"
 
 function swri_oldapi_conv_flt_to_s16_neon, export=1
-_swri_oldapi_conv_flt_to_s16_neon:
+.L_swri_oldapi_conv_flt_to_s16_neon:
 subsr2,  r2,  #8
 vld1.32 {q0}, [r1,:128]!
 vcvt.s32.f32q8,  q0,  #31
@@ -67,7 +67,7 @@ _swri_oldapi_conv_flt_to_s16_neon:
 endfunc
 
 function swri_oldapi_conv_fltp_to_s16_2ch_neon, export=1
-_swri_oldapi_conv_fltp_to_s16_2ch_neon:
+.L_swri_oldapi_conv_fltp_to_s16_2ch_neon:
 ldm r1,  {r1, r3}
 subsr2,  r2,  #8
 vld1.32 {q0}, [r1,:128]!
@@ -135,8 +135,8 @@ function swri_oldapi_conv_fltp_to_s16_nch_neon, export=1
 cmp r3,  #2
 itt lt
 ldrlt   r1,  [r1]
-blt _swri_oldapi_conv_flt_to_s16_neon
-beq _swri_oldapi_conv_fltp_to_s16_2ch_neon
+blt .L_swri_oldapi_conv_flt_to_s16_neon
+beq .L_swri_oldapi_conv_fltp_to_s16_2ch_neon
 
 push{r4-r8, lr}
 cmp r3,  #4

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/movenc: Write version 2 of audio atom if channels is not known

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: release/3.4 | Michael Niedermayer  | 
Sun Jul  8 00:16:42 2018 +0200| [2b8d4f6f0186b3ed0b223f665d32c36ed887149e] | 
committer: Michael Niedermayer

avformat/movenc: Write version 2 of audio atom if channels is not known

The version 1 needs the channel count and would divide by 0
Fixes: division by 0
Fixes: fpe_movenc.c_1108_1.ogg
Fixes: fpe_movenc.c_1108_2.ogg
Fixes: fpe_movenc.c_1108_3.wav

Found-by: #CHEN HONGXU# 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit fa19fbcf712a6a6cc5a5cfdc3254a97b9bce6582)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b8d4f6f0186b3ed0b223f665d32c36ed887149e
---

 libavformat/movenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index cfbe554dd4..b57778bd4f 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -964,7 +964,7 @@ static int mov_write_audio_tag(AVFormatContext *s, 
AVIOContext *pb, MOVMuxContex
 uint32_t tag = track->tag;
 
 if (track->mode == MODE_MOV) {
-if (track->timescale > UINT16_MAX) {
+if (track->timescale > UINT16_MAX || !track->par->channels) {
 if (mov_get_lpcm_flags(track->par->codec_id))
 tag = AV_RL32("lpcm");
 version = 2;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dvdsub_parser: Init output buf/size

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: release/3.4 | Michael Niedermayer  | 
Fri Jul 13 18:54:48 2018 +0200| [6ea8b39c905722201424e12f9c179732fb5dac58] | 
committer: Michael Niedermayer

avcodec/dvdsub_parser: Init output buf/size

No testcase

Signed-off-by: Michael Niedermayer 
(cherry picked from commit 9e6c8437761661441d836876934314cb2b8fafe7)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ea8b39c905722201424e12f9c179732fb5dac58
---

 libavcodec/dvdsub_parser.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c
index 32a945ed65..8e1c48bef6 100644
--- a/libavcodec/dvdsub_parser.c
+++ b/libavcodec/dvdsub_parser.c
@@ -44,6 +44,9 @@ static int dvdsub_parse(AVCodecParserContext *s,
 {
 DVDSubParseContext *pc = s->priv_data;
 
+*poutbuf  = buf;
+*poutbuf_size = buf_size;
+
 if (pc->packet_index == 0) {
 if (buf_size < 2 || AV_RB16(buf) && buf_size < 6) {
 if (buf_size)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dvdsub_parser: Allocate input padding

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: release/3.4 | Michael Niedermayer  | 
Fri Jul 13 18:56:10 2018 +0200| [6f354ca5fd5e758cdc0151f6e84936c44e0b8e2f] | 
committer: Michael Niedermayer

avcodec/dvdsub_parser: Allocate input padding

Fixes: out of array read
Fixes: 
9350/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DVDSUB_fuzzer-574650765568

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit cd86b5cfe278af79d6b147e122d9a72c270a9fde)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f354ca5fd5e758cdc0151f6e84936c44e0b8e2f
---

 libavcodec/dvdsub_parser.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c
index 8e1c48bef6..698ccb6987 100644
--- a/libavcodec/dvdsub_parser.c
+++ b/libavcodec/dvdsub_parser.c
@@ -57,7 +57,11 @@ static int dvdsub_parse(AVCodecParserContext *s,
 if (pc->packet_len == 0) /* HD-DVD subpicture packet */
 pc->packet_len = AV_RB32(buf+2);
 av_freep(&pc->packet);
-pc->packet = av_malloc(pc->packet_len);
+if ((unsigned)pc->packet_len > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) 
{
+av_log(avctx, AV_LOG_ERROR, "packet length %d is invalid\n", 
pc->packet_len);
+return buf_size;
+}
+pc->packet = av_malloc(pc->packet_len + AV_INPUT_BUFFER_PADDING_SIZE);
 }
 if (pc->packet) {
 if (pc->packet_index + buf_size <= pc->packet_len) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Tag n4.0.2 : FFmpeg 4.0.2 release

2018-07-18 Thread git 
[ffmpeg] [branch: refs/tags/n4.0.2]
Tag:fb012fd6a887085be657782b5c000769eebb5c69
> http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=fb012fd6a887085be657782b5c000769eebb5c69

Tagger: Michael Niedermayer 
Date:   Wed Jul 18 15:51:14 2018 +0200

FFmpeg 4.0.2 release
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 7ca305d web/download: add 4.0.2

2018-07-18 Thread ffmpeg-git 
The branch, master has been updated
   via  7ca305d3e6f00da3aae10b95bb3f25987a8c1f77 (commit)
  from  1f3b1a9fd59faca2f6ecffd420001cd9d3d0ca8e (commit)


- Log -
commit 7ca305d3e6f00da3aae10b95bb3f25987a8c1f77
Author: Michael Niedermayer 
AuthorDate: Wed Jul 18 16:15:33 2018 +0200
Commit: Michael Niedermayer 
CommitDate: Wed Jul 18 16:15:33 2018 +0200

web/download: add 4.0.2

diff --git a/src/download b/src/download
index de3077a..905382a 100644
--- a/src/download
+++ b/src/download
@@ -1,10 +1,10 @@
 
 
   
-https://ffmpeg.org/releases/ffmpeg-4.0.1.tar.bz2"; class="btn 
btn-success">
+https://ffmpeg.org/releases/ffmpeg-4.0.2.tar.bz2"; class="btn 
btn-success">
   
   Download
-  ffmpeg-4.0.1.tar.bz2
+  ffmpeg-4.0.2.tar.bz2
 
 
 More releases
@@ -272,10 +272,10 @@
 and much faster bug fixes such as additional features and security patches.
   
 
-  FFmpeg 4.0.1 "Wu"
+  FFmpeg 4.0.2 "Wu"
 
   
-4.0.1 was released on 2018-06-16. It is the latest stable FFmpeg release
+4.0.2 was released on 2018-07-18. It is the latest stable FFmpeg release
 from the 4.0 release branch, which was cut from master on 2018-04-16.
   
   It includes the following library versions:
@@ -292,19 +292,19 @@ libpostproc55.  1.100
 
   
 
-  Download 
xz tarball
-  PGP 
signature
+  Download 
xz tarball
+  PGP 
signature
  
 
-  Download 
bzip2 tarball
-  PGP 
signature
+  Download 
bzip2 tarball
+  PGP 
signature
  
 
-  Download 
gzip tarball
-  PGP 
signature
+  Download 
gzip tarball
+  PGP 
signature
  
 
-  https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.0.1";>Changelog
+  https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.0.2";>Changelog
   https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/4.0:/RELEASE_NOTES";>Release
 Notes
  


---

Summary of changes:
 src/download | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Tag n3.4.4 : FFmpeg 3.4.4 release

2018-07-18 Thread git 
[ffmpeg] [branch: refs/tags/n3.4.4]
Tag:9f23f2ff3b40a5b7b7e176f3f586e72b89b4b60f
> http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=9f23f2ff3b40a5b7b7e176f3f586e72b89b4b60f

Tagger: Michael Niedermayer 
Date:   Wed Jul 18 16:32:40 2018 +0200

FFmpeg 3.4.4 release
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] [ffmpeg-web] branch master updated. a3ac68c web/download: add 3.4.4

2018-07-18 Thread ffmpeg-git 
The branch, master has been updated
   via  a3ac68cecfe5ffe164b37301d87243a08071aed9 (commit)
  from  7ca305d3e6f00da3aae10b95bb3f25987a8c1f77 (commit)


- Log -
commit a3ac68cecfe5ffe164b37301d87243a08071aed9
Author: Michael Niedermayer 
AuthorDate: Wed Jul 18 16:43:41 2018 +0200
Commit: Michael Niedermayer 
CommitDate: Wed Jul 18 16:43:41 2018 +0200

web/download: add 3.4.4

diff --git a/src/download b/src/download
index 905382a..cde9a55 100644
--- a/src/download
+++ b/src/download
@@ -309,10 +309,10 @@ libpostproc55.  1.100
  

 
-  FFmpeg 3.4.3 "Cantor"
+  FFmpeg 3.4.4 "Cantor"
 
   
-3.4.3 was released on 2018-07-08. It is the latest stable FFmpeg release
+3.4.4 was released on 2018-07-18. It is the latest stable FFmpeg release
 from the 3.4 release branch, which was cut from master on 2017-10-11.
   
   It includes the following library versions:
@@ -330,19 +330,19 @@ libpostproc54.  7.100
 
   
 
-  Download 
xz tarball
-  PGP 
signature
+  Download 
xz tarball
+  PGP 
signature
  
 
-  Download 
bzip2 tarball
-  PGP 
signature
+  Download 
bzip2 tarball
+  PGP 
signature
  
 
-  Download 
gzip tarball
-  PGP 
signature
+  Download 
gzip tarball
+  PGP 
signature
  
 
-  https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n3.4.3";>Changelog
+  https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n3.4.4";>Changelog
   https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/3.4:/RELEASE_NOTES";>Release
 Notes
  


---

Summary of changes:
 src/download | 18 +-
 1 file changed, 9 insertions(+), 9 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. 8705986 web/security: add CVEs for current releases

2018-07-18 Thread ffmpeg-git 
The branch, master has been updated
   via  87059868ec04033702e1859400e593f171f775b4 (commit)
  from  a3ac68cecfe5ffe164b37301d87243a08071aed9 (commit)


- Log -
commit 87059868ec04033702e1859400e593f171f775b4
Author: Michael Niedermayer 
AuthorDate: Wed Jul 18 16:52:40 2018 +0200
Commit: Michael Niedermayer 
CommitDate: Wed Jul 18 16:52:40 2018 +0200

web/security: add CVEs for current releases

diff --git a/src/security b/src/security
index acc10cf..69ca21b 100644
--- a/src/security
+++ b/src/security
@@ -2,6 +2,18 @@
 
 FFmpeg 4.0
 
+4.0.2
+
+Fixes following vulnerabilities:
+
+
+CVE-2018-13300, 76105382244e79d072e7b993c7caf584151b0694 / 
95556e27e2c1d56d9e18f5db34d6f756f3011148
+CVE-2018-13301, 679d749eaba9e5a8b8a9ea22500ab559f5be8940 / 
2aa9047486dbff12d9e040f917e5f799ed2fd78b
+CVE-2018-13302, 20c5fb972101fa25dedaf35a9c0ce2bf02fa6b52 / 
ed22dc22216f74c75ee7901f82649e1ff725ba50
+CVE-2018-13303, 0003ace83b18f68c981c8ad401bee75315edf9f5 / 
00e8181bd97c834fe60751b0c511d4bb97875f78
+CVE-2018-13304, 5fd1dce39a70340b9fd508154e48985902602e25 / 
bd27a9364ca274ca97f1df6d984e88a0700fb235
+
+
 4.0.1
 
 Fixes following vulnerabilities:
@@ -24,6 +36,19 @@ CVE-2018-7557, 7414d0bda7763f9bd69c26c068e482ab297c1c96
 
 FFmpeg 3.4
 
+3.4.3
+
+Fixes following vulnerabilities:
+
+
+CVE-2018-7557,  ae49cc73f265a155e5c4b1715570aab3d9741b4d / 
7414d0bda7763f9bd69c26c068e482ab297c1c96
+CVE-2018-7751,  3fa6e594a0f2575ddb6b2183961fde42ab5ab37b / 
a6cba062051f345e8ebfdff34aba071ed73d923f
+CVE-2018-10001, 51035698bde9c13da7eedc1f6eb47d190bbc949d / 
47b7c68ae54560e2308bdb6be4fb076c73b93081
+CVE-2018-12458, bd1fd3ff4b0437153a6c4717f59ce31a7bba8ca0 / 
e1182fac1afba92a4975917823a5f644bee7e6e8
+CVE-2018-13300, 3a04f518ac283194bb13d8aff7d9fa963d551547 / 
95556e27e2c1d56d9e18f5db34d6f756f3011148
+CVE-2018-13302, 36c779bffe2ceef48a0fa4d7a6691c6895faf9e2 / 
ed22dc22216f74c75ee7901f82649e1ff725ba50
+
+
 3.4.2
 
 Fixes following vulnerabilities:
@@ -54,6 +79,16 @@ CVE-2017-17081, 127a362630e11fe724e2e63fc871791fdcbcfa64
 
 FFmpeg 3.3
 
+3.3.8
+
+Fixes following vulnerabilities:
+
+
+CVE-2018-12458, d1bac7f2a68e164385d7018f2c2562e0d219 / 
e1182fac1afba92a4975917823a5f644bee7e6e8
+CVE-2018-13300, 672ada0f179b3ef45e52987d8c96716d23aa0722 / 
95556e27e2c1d56d9e18f5db34d6f756f3011148
+CVE-2018-13302, 78b1fbca3404459dcf8a1c34b5c7f9a5825ad61f / 
ed22dc22216f74c75ee7901f82649e1ff725ba5
+
+
 3.3.7
 
 Fixes following vulnerabilities:
@@ -62,6 +97,7 @@ Fixes following vulnerabilities:
 CVE-2018-6621, 0322f781777d4413bd57815ee9b5a7d6a0cfe716 / 
118e1b0b3370dd1c0da442901b486689efd1654b
 CVE-2018-6392, d74839d793ebf8c6c7c4a2a8a22ae2bd695d2c41 / 
3f621455d62e46745453568d915badd5b1e5bcd5
 CVE-2018-7557, bafb13dc0fd60f49f613bf4c52ce88b91176755c / 
7414d0bda7763f9bd69c26c068e482ab297c1c96
+CVE-2018-10001,15d4dc0da1e9f2450b5f9e748e1704fc0e6ef3a4 / 
47b7c68ae54560e2308bdb6be4fb076c73b93081
 
 
 3.3.6
@@ -150,6 +186,20 @@ CVE-2017-7866, e371f031b942d73e02c090170975561fabd5c264
 
 FFmpeg 3.2
 
+3.2.11
+
+Fixes following vulnerabilities:
+
+
+CVE-2018-6392,  c4ba170cad2ccdd896ea6fd3a890980008606541 / 
3f621455d62e46745453568d915badd5b1e5bcd5
+CVE-2018-6621,  22aa37c0fedf14531783189a197542a055959b6c / 
118e1b0b3370dd1c0da442901b486689efd1654b
+CVE-2018-7557,  9c0593576454992e5739729623ca3ed1fe93d12e / 
7414d0bda7763f9bd69c26c068e482ab297c1c96
+CVE-2018-10001, 7050970d066b853f82b0891fd7b57c19b4fd9095 / 
47b7c68ae54560e2308bdb6be4fb076c73b93081
+CVE-2018-12458, d6f8960812b0a4ceac299a9000a1e921c74e431a / 
e1182fac1afba92a4975917823a5f644bee7e6e8
+CVE-2018-13300, e6d3fd942f772f54ab6a5ca619cdaadef26b7702 / 
95556e27e2c1d56d9e18f5db34d6f756f3011148
+CVE-2018-13302, 92972f19168f323cfe133a42abf130a5f159bfd6 / 
ed22dc22216f74c75ee7901f82649e1ff725ba50
+
+
 3.2.10
 
 Fixes following vulnerabilities:
@@ -513,6 +563,16 @@ CVE-2016-7122, 1d90326f95a791db515f69a01a5f6ef867896d15 / 
e4e4a9cad7f21593d4bcb1
 
 FFmpeg 2.8
 
+2.8.15
+
+Fixes following vulnerabilities:
+
+
+CVE-2018-7557,  e724bd1dd9efea3abb8586d6644ec07694afceae / 
7414d0bda7763f9bd69c26c068e482ab297c1c96
+CVE-2018-12458, 6bbef938839adc55e8e048bc9cc2e0fafe2064df / 
e1182fac1afba92a4975917823a5f644bee7e6e8
+CVE-2018-13302, a80b8a01cc934b3417cea5c50a9f607d77f223ec / 
ed22dc22216f74c75ee7901f82649e1ff725ba50
+
+
 2.8.14
 
 Fixes following vulnerabilities:

---

Summary of changes:
 src/security | 60 
 1 file changed, 60 insertions(+)


hooks/post-receive
-- 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] swresample/arm: rename labels to fix xcode build error

2018-07-18 Thread Rahul Chaudhry 
ffmpeg | branch: release/3.2 | Rahul Chaudhry  | 
Fri Apr 27 13:49:52 2018 -0700| [a1d4de0559cc19bc349bc8a20e99673dc26cdfae] | 
committer: Michael Niedermayer

swresample/arm: rename labels to fix xcode build error

Signed-off-by: Michael Niedermayer 
(cherry picked from commit e84212b78e00df17799e01be1e153a073eb8f689)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1d4de0559cc19bc349bc8a20e99673dc26cdfae
---

 libswresample/arm/audio_convert_neon.S | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libswresample/arm/audio_convert_neon.S 
b/libswresample/arm/audio_convert_neon.S
index 7729514701..085d50aafa 100644
--- a/libswresample/arm/audio_convert_neon.S
+++ b/libswresample/arm/audio_convert_neon.S
@@ -22,7 +22,7 @@
 #include "libavutil/arm/asm.S"
 
 function swri_oldapi_conv_flt_to_s16_neon, export=1
-_swri_oldapi_conv_flt_to_s16_neon:
+.L_swri_oldapi_conv_flt_to_s16_neon:
 subsr2,  r2,  #8
 vld1.32 {q0}, [r1,:128]!
 vcvt.s32.f32q8,  q0,  #31
@@ -67,7 +67,7 @@ _swri_oldapi_conv_flt_to_s16_neon:
 endfunc
 
 function swri_oldapi_conv_fltp_to_s16_2ch_neon, export=1
-_swri_oldapi_conv_fltp_to_s16_2ch_neon:
+.L_swri_oldapi_conv_fltp_to_s16_2ch_neon:
 ldm r1,  {r1, r3}
 subsr2,  r2,  #8
 vld1.32 {q0}, [r1,:128]!
@@ -135,8 +135,8 @@ function swri_oldapi_conv_fltp_to_s16_nch_neon, export=1
 cmp r3,  #2
 itt lt
 ldrlt   r1,  [r1]
-blt _swri_oldapi_conv_flt_to_s16_neon
-beq _swri_oldapi_conv_fltp_to_s16_2ch_neon
+blt .L_swri_oldapi_conv_flt_to_s16_neon
+beq .L_swri_oldapi_conv_fltp_to_s16_2ch_neon
 
 push{r4-r8, lr}
 cmp r3,  #4

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/utils: fix mixed declarations and code

2018-07-18 Thread James Almer 
ffmpeg | branch: release/3.2 | James Almer  | Fri Nov 24 
17:46:16 2017 -0300| [e870255e4e3d7ed8ee15b9e205d922086af37eea] | committer: 
Michael Niedermayer

avformat/utils: fix mixed declarations and code

Signed-off-by: James Almer 
(cherry picked from commit 31de45d20b1ff90d4baf7c5a65e88f582efdb2a6)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e870255e4e3d7ed8ee15b9e205d922086af37eea
---

 libavformat/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 8129528a85..eda9220923 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1711,10 +1711,10 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt)
 
 if (next_pkt->dts != AV_NOPTS_VALUE) {
 int wrap_bits = 
s->streams[next_pkt->stream_index]->pts_wrap_bits;
-av_assert2(wrap_bits <= 64);
 // last dts seen for this stream. if any of packets following
 // current one had no dts, we will set this to AV_NOPTS_VALUE.
 int64_t last_dts = next_pkt->dts;
+av_assert2(wrap_bits <= 64);
 while (pktl && next_pkt->pts == AV_NOPTS_VALUE) {
 if (pktl->pkt.stream_index == next_pkt->stream_index &&
 av_compare_mod(next_pkt->dts, pktl->pkt.dts, 2ULL << 
(wrap_bits - 1)) < 0) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/movenc: Write version 2 of audio atom if channels is not known

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: release/3.2 | Michael Niedermayer  | 
Sun Jul  8 00:16:42 2018 +0200| [2c0e98a0b478284bdff6d7a4062522605a8beae5] | 
committer: Michael Niedermayer

avformat/movenc: Write version 2 of audio atom if channels is not known

The version 1 needs the channel count and would divide by 0
Fixes: division by 0
Fixes: fpe_movenc.c_1108_1.ogg
Fixes: fpe_movenc.c_1108_2.ogg
Fixes: fpe_movenc.c_1108_3.wav

Found-by: #CHEN HONGXU# 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit fa19fbcf712a6a6cc5a5cfdc3254a97b9bce6582)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c0e98a0b478284bdff6d7a4062522605a8beae5
---

 libavformat/movenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 1e4b7a1309..5e65ad3dc6 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -914,7 +914,7 @@ static int mov_write_audio_tag(AVFormatContext *s, 
AVIOContext *pb, MOVMuxContex
 uint32_t tag = track->tag;
 
 if (track->mode == MODE_MOV) {
-if (track->timescale > UINT16_MAX) {
+if (track->timescale > UINT16_MAX || !track->par->channels) {
 if (mov_get_lpcm_flags(track->par->codec_id))
 tag = AV_RL32("lpcm");
 version = 2;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dvdsub_parser: Allocate input padding

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: release/3.2 | Michael Niedermayer  | 
Fri Jul 13 18:56:10 2018 +0200| [94fda4f9ec95aee15f97686e01a43545d87944e7] | 
committer: Michael Niedermayer

avcodec/dvdsub_parser: Allocate input padding

Fixes: out of array read
Fixes: 
9350/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DVDSUB_fuzzer-574650765568

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit cd86b5cfe278af79d6b147e122d9a72c270a9fde)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94fda4f9ec95aee15f97686e01a43545d87944e7
---

 libavcodec/dvdsub_parser.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c
index 8e1c48bef6..698ccb6987 100644
--- a/libavcodec/dvdsub_parser.c
+++ b/libavcodec/dvdsub_parser.c
@@ -57,7 +57,11 @@ static int dvdsub_parse(AVCodecParserContext *s,
 if (pc->packet_len == 0) /* HD-DVD subpicture packet */
 pc->packet_len = AV_RB32(buf+2);
 av_freep(&pc->packet);
-pc->packet = av_malloc(pc->packet_len);
+if ((unsigned)pc->packet_len > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) 
{
+av_log(avctx, AV_LOG_ERROR, "packet length %d is invalid\n", 
pc->packet_len);
+return buf_size;
+}
+pc->packet = av_malloc(pc->packet_len + AV_INPUT_BUFFER_PADDING_SIZE);
 }
 if (pc->packet) {
 if (pc->packet_index + buf_size <= pc->packet_len) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dirac_dwt_template: Fix signedness regression in interleave()

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: release/3.2 | Michael Niedermayer  | 
Fri Jul 13 18:33:08 2018 +0200| [fe73afd730be56877221e415e7d32f5f4ae24b7a] | 
committer: Michael Niedermayer

avcodec/dirac_dwt_template: Fix signedness regression in interleave()

Found-by: 
Tested-by: James Darnley 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 181435a4de6e38e0a15ddaf16de9a157ef41cb18)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe73afd730be56877221e415e7d32f5f4ae24b7a
---

 libavcodec/dirac_dwt_template.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dirac_dwt_template.c b/libavcodec/dirac_dwt_template.c
index 528fc7e9e7..2369c8d15b 100644
--- a/libavcodec/dirac_dwt_template.c
+++ b/libavcodec/dirac_dwt_template.c
@@ -57,8 +57,8 @@ static av_always_inline void RENAME(interleave)(TYPE *dst, 
TYPE *src0, TYPE *src
 {
 int i;
 for (i = 0; i < w2; i++) {
-dst[2*i  ] = (src0[i] + (unsigned)add) >> shift;
-dst[2*i+1] = (src1[i] + (unsigned)add) >> shift;
+dst[2*i  ] = ((int)(src0[i] + (unsigned)add)) >> shift;
+dst[2*i+1] = ((int)(src1[i] + (unsigned)add)) >> shift;
 }
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dvdsub_parser: Init output buf/size

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: release/3.2 | Michael Niedermayer  | 
Fri Jul 13 18:54:48 2018 +0200| [ffc9ef8f4c742f47be5f5fe8820bb85fdb2d69b4] | 
committer: Michael Niedermayer

avcodec/dvdsub_parser: Init output buf/size

No testcase

Signed-off-by: Michael Niedermayer 
(cherry picked from commit 9e6c8437761661441d836876934314cb2b8fafe7)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffc9ef8f4c742f47be5f5fe8820bb85fdb2d69b4
---

 libavcodec/dvdsub_parser.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c
index 32a945ed65..8e1c48bef6 100644
--- a/libavcodec/dvdsub_parser.c
+++ b/libavcodec/dvdsub_parser.c
@@ -44,6 +44,9 @@ static int dvdsub_parse(AVCodecParserContext *s,
 {
 DVDSubParseContext *pc = s->priv_data;
 
+*poutbuf  = buf;
+*poutbuf_size = buf_size;
+
 if (pc->packet_index == 0) {
 if (buf_size < 2 || AV_RB16(buf) && buf_size < 6) {
 if (buf_size)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Update for 3.2.12

2018-07-18 Thread Michael Niedermayer 
ffmpeg | branch: release/3.2 | Michael Niedermayer  | 
Wed Jul 18 23:04:10 2018 +0200| [a911f234e26e488198dff8aec8a5ff3c2e052cc4] | 
committer: Michael Niedermayer

Update for 3.2.12

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a911f234e26e488198dff8aec8a5ff3c2e052cc4
---

 Changelog| 9 +
 RELEASE  | 2 +-
 doc/Doxyfile | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index b05034d271..1269c350c9 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,15 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
+version 3.2.12:
+- avcodec/dvdsub_parser: Allocate input padding
+- avcodec/dvdsub_parser: Init output buf/size
+- avcodec/dirac_dwt_template: Fix signedness regression in interleave()
+- avformat/movenc: Write version 2 of audio atom if channels is not known
+- swresample/arm: rename labels to fix xcode build error
+- avformat/utils: fix mixed declarations and code
+- avcodec/imgconvert: fix possible null pointer dereference
+
 version 3.2.11:
 - avformat/mov: Fix extradata memleak
 - lavc/libopusdec: Allow avcodec_open2 to call .close
diff --git a/RELEASE b/RELEASE
index 17ce91803c..275e51e5e5 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-3.2.11
+3.2.12
diff --git a/doc/Doxyfile b/doc/Doxyfile
index d72a1c5f09..b9bddac6e7 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME   = FFmpeg
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = 3.2.11
+PROJECT_NUMBER = 3.2.12
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Tag n3.2.12 : FFmpeg 3.2.12 release

2018-07-18 Thread git 
[ffmpeg] [branch: refs/tags/n3.2.12]
Tag:23aa3e29d192d87313692bf6222cf9c6cb9eaa0f
> http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=23aa3e29d192d87313692bf6222cf9c6cb9eaa0f

Tagger: Michael Niedermayer 
Date:   Wed Jul 18 23:31:54 2018 +0200

FFmpeg 3.2.12 release
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 8648f09 web/download: add 3.2.12

2018-07-18 Thread ffmpeg-git 
The branch, master has been updated
   via  8648f091968d24233ceacc557b08e771d3d96213 (commit)
  from  87059868ec04033702e1859400e593f171f775b4 (commit)


- Log -
commit 8648f091968d24233ceacc557b08e771d3d96213
Author: Michael Niedermayer 
AuthorDate: Wed Jul 18 23:44:34 2018 +0200
Commit: Michael Niedermayer 
CommitDate: Wed Jul 18 23:44:34 2018 +0200

web/download: add 3.2.12

diff --git a/src/download b/src/download
index cde9a55..183ca95 100644
--- a/src/download
+++ b/src/download
@@ -385,10 +385,10 @@ libpostproc54.  5.100
  

 
-  FFmpeg 3.2.11 "Hypatia"
+  FFmpeg 3.2.12 "Hypatia"
 
   
-3.2.11 was released on 2018-07-09. It is the latest stable FFmpeg release
+3.2.12 was released on 2018-07-18. It is the latest stable FFmpeg release
 from the 3.2 release branch, which was cut from master on 2016-10-26.
   
   It includes the following library versions:
@@ -406,19 +406,19 @@ libpostproc54.  1.100
 
   
 
-  Download 
xz tarball
-  PGP 
signature
+  Download 
xz tarball
+  PGP 
signature
  
 
-  Download bzip2 tarball
-  PGP 
signature
+  Download bzip2 tarball
+  PGP 
signature
  
 
-  Download 
gzip tarball
-  PGP 
signature
+  Download 
gzip tarball
+  PGP 
signature
  
 
-  https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n3.2.11";>Changelog
+  https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n3.2.12";>Changelog
   https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/3.2:/RELEASE_NOTES";>Release
 Notes
  


---

Summary of changes:
 src/download | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog