[FFmpeg-cvslog] avcodec/x86/h264_weight: handle weight1=128
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9 05:11:09 2015 +0200| [e1009665759d4a3938dd2dd07b7e84d8bc9c5290] | committer: Michael Niedermayer avcodec/x86/h264_weight: handle weight1=128 Fix ticket4596 Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1009665759d4a3938dd2dd07b7e84d8bc9c5290 --- libavcodec/x86/h264_weight.asm |3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/x86/h264_weight.asm b/libavcodec/x86/h264_weight.asm index b4fb9db..1e1219d 100644 --- a/libavcodec/x86/h264_weight.asm +++ b/libavcodec/x86/h264_weight.asm @@ -135,8 +135,11 @@ WEIGHT_FUNC_HALF_MM 8, 8 add off_regd, 1 or off_regd, 1 addr4, 1 +cmpr6d, 128 + je .nonnormal cmpr5, 128 jne .normal +.nonnormal sarr5, 1 sarr6, 1 sar off_regd, 1 ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavf/segment: add an option to allow breaking on non-keyframes
ffmpeg | branch: master | Rodger Combs rodger.co...@gmail.com | Tue Jun 9
02:32:18 2015 -0500| [e60b018c7416a9a0608768703166973f37e5e326] | committer:
Michael Niedermayer
lavf/segment: add an option to allow breaking on non-keyframes
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e60b018c7416a9a0608768703166973f37e5e326
---
libavformat/segment.c |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 1162ea2..4418d0f 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -111,6 +111,7 @@ typedef struct SegmentContext {
int64_t initial_offset;/// initial timestamps offset, expressed in
microseconds
char *reference_stream_specifier; /// reference stream specifier
int reference_stream_index;
+int break_non_keyframes;
SegmentListEntry cur_entry;
SegmentListEntry *segment_list_entries;
@@ -780,7 +781,7 @@ static int seg_write_packet(AVFormatContext *s, AVPacket
*pkt)
pkt-stream_index == seg-reference_stream_index ?
seg-frame_count : -1);
if (pkt-stream_index == seg-reference_stream_index
-pkt-flags AV_PKT_FLAG_KEY
+(pkt-flags AV_PKT_FLAG_KEY || seg-break_non_keyframes)
seg-segment_frame_count 0
(seg-cut_pending || seg-frame_count = start_frame ||
(pkt-pts != AV_NOPTS_VALUE
@@ -920,6 +921,7 @@ static const AVOption options[] = {
{ segment_start_number, set the sequence number of the first segment,
OFFSET(segment_idx), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E },
{ segment_wrap_number, set the number of wrap before the first
segment, OFFSET(segment_idx_wrap_nb), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX,
E },
{ strftime, set filename expansion with strftime at segment
creation, OFFSET(use_strftime), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, E },
+{ break_non_keyframes, allow breaking segments on non-keyframes,
OFFSET(break_non_keyframes), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, E },
{ individual_header_trailer, write header/trailer to each segment,
OFFSET(individual_header_trailer), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, E },
{ write_header_trailer, write a header to the first segment and a
trailer to the last one, OFFSET(write_header_trailer), AV_OPT_TYPE_INT, {.i64
= 1}, 0, 1, E },
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/jpeg2000dec: Add placeholder for PLT parsing
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9
15:16:46 2015 +0200| [45db92180693b0a4663bc4c30ada0af1da041558] | committer:
Michael Niedermayer
avcodec/jpeg2000dec: Add placeholder for PLT parsing
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45db92180693b0a4663bc4c30ada0af1da041558
---
libavcodec/jpeg2000dec.c | 20
1 file changed, 20 insertions(+)
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index c5a3bd2..aecc6eb 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -673,6 +673,22 @@ static uint8_t get_tlm(Jpeg2000DecoderContext *s, int n)
return 0;
}
+static uint8_t get_plt(Jpeg2000DecoderContext *s, int n)
+{
+int i;
+
+av_log(s-avctx, AV_LOG_ERROR,
+PLT marker at pos 0x%X\n, bytestream2_tell(s-g) - 4);
+
+/*Zplt =*/ bytestream2_get_byte(s-g);
+
+for (i = 0; i n - 3; i++) {
+bytestream2_get_byte(s-g);
+}
+
+return 0;
+}
+
static int init_tile(Jpeg2000DecoderContext *s, int tileno)
{
int compno;
@@ -1469,6 +1485,10 @@ static int
jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
// Tile-part lengths
ret = get_tlm(s, len);
break;
+case JPEG2000_PLT:
+// Packet length, tile-part header
+ret = get_plt(s, len);
+break;
default:
av_log(s-avctx, AV_LOG_ERROR,
unsupported marker 0x%.4PRIX16 at pos 0x%X\n,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/muxers: document new break_non_keyframes option
ffmpeg | branch: master | Rodger Combs rodger.co...@gmail.com | Tue Jun 9
06:44:51 2015 -0500| [4b082bc2419d70333c4240e6cfad1ce11f36ae2a] | committer:
Michael Niedermayer
doc/muxers: document new break_non_keyframes option
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b082bc2419d70333c4240e6cfad1ce11f36ae2a
---
doc/muxers.texi |6 ++
1 file changed, 6 insertions(+)
diff --git a/doc/muxers.texi b/doc/muxers.texi
index ddd7c7a..95cdb8f 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -1030,6 +1030,12 @@ segments to write. If this is selected, the output
segment name must
contain a @code{strftime} function template. Default value is
@code{0}.
+@item break_non_keyframes @var{1|0}
+If enabled, allow segments to start on frames other than keyframes. This
+improves behavior on some players when the time between keyframes is
+inconsistent, but may make things worse on others, and can cause some oddities
+during seeking. Defaults to @code{0}.
+
@item reset_timestamps @var{1|0}
Reset timestamps at the begin of each segment, so that each segment
will start with near-zero timestamps. It is meant to ease the playback
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'fb1473080223a634b8ac2cca48a632d037a0a69d'
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9 17:21:45 2015 +0200| [5f48a73bb099ed5302d332d8611bffd3bb3018ce] | committer: Michael Niedermayer Merge commit 'fb1473080223a634b8ac2cca48a632d037a0a69d' * commit 'fb1473080223a634b8ac2cca48a632d037a0a69d': aac_parser: add required padding for GetBitContext buffer See: fccd85b9f30525f88692f53134eba41f1f2d90db Merged-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f48a73bb099ed5302d332d8611bffd3bb3018ce --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] aac_parser: add required padding for GetBitContext buffer
ffmpeg | branch: master | Janne Grunau janne-li...@jannau.net | Mon Jun 8
14:45:12 2015 +0200| [fb1473080223a634b8ac2cca48a632d037a0a69d] | committer:
Janne Grunau
aac_parser: add required padding for GetBitContext buffer
Fixes stack buffer overflow errors detected by address sanitizer in
various fate tests.
CC: libav-sta...@libav.org
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb1473080223a634b8ac2cca48a632d037a0a69d
---
libavcodec/aac_parser.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
index fdaa5f8..acb05d4 100644
--- a/libavcodec/aac_parser.c
+++ b/libavcodec/aac_parser.c
@@ -34,7 +34,7 @@ static int aac_sync(uint64_t state, AACAC3ParseContext
*hdr_info,
int size;
union {
uint64_t u64;
-uint8_t u8[8];
+uint8_t u8[8 + FF_INPUT_BUFFER_PADDING_SIZE];
} tmp;
tmp.u64 = av_be2ne64(state);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '09447f2b0fafac6d9565aab82a4c5f16fc99ee5e'
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9 17:35:07 2015 +0200| [840465ebf979ee4fbab308f1019aa6f7026373c7] | committer: Michael Niedermayer Merge commit '09447f2b0fafac6d9565aab82a4c5f16fc99ee5e' * commit '09447f2b0fafac6d9565aab82a4c5f16fc99ee5e': ac3_parser: add required padding for GetBitContext buffer See: fccd85b9f30525f88692f53134eba41f1f2d90db Merged-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=840465ebf979ee4fbab308f1019aa6f7026373c7 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ac3_parser: add required padding for GetBitContext buffer
ffmpeg | branch: master | Janne Grunau janne-li...@jannau.net | Mon Jun 8
14:48:26 2015 +0200| [09447f2b0fafac6d9565aab82a4c5f16fc99ee5e] | committer:
Janne Grunau
ac3_parser: add required padding for GetBitContext buffer
Fixes stack buffer overflow errors detected by address sanitizer in
various fate tests.
CC: libav-sta...@libav.org
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09447f2b0fafac6d9565aab82a4c5f16fc99ee5e
---
libavcodec/ac3_parser.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
index 5ea09f8..69d88c1 100644
--- a/libavcodec/ac3_parser.c
+++ b/libavcodec/ac3_parser.c
@@ -150,7 +150,7 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext
*hdr_info,
int err;
union {
uint64_t u64;
-uint8_t u8[8];
+uint8_t u8[8 + FF_INPUT_BUFFER_PADDING_SIZE];
} tmp = { av_be2ne64(state) };
AC3HeaderInfo hdr;
GetBitContext gbc;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/jpeg2000: Disable special case for JPEG2000_QSTY_SI
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9 16:30:35 2015 +0200| [44327cbc9a8c8f766e7e3f567b647b68c89d16bd] | committer: Michael Niedermayer avcodec/jpeg2000: Disable special case for JPEG2000_QSTY_SI The code gave apparently completely wrong values Fixes Ticket2872 Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44327cbc9a8c8f766e7e3f567b647b68c89d16bd --- libavcodec/jpeg2000.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 770dffb..1717bc3 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -293,11 +293,11 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, break; case JPEG2000_QSTY_SI: /*TODO: Compute formula to implement. */ -numbps = cbps + - lut_gain[codsty-transform == FF_DWT53][bandno + (reslevelno 0)]; -band-f_stepsize = SHL(2048 + qntsty-mant[gbandno], - 2 + numbps - qntsty-expn[gbandno]); -break; +// numbps = cbps + +// lut_gain[codsty-transform == FF_DWT53][bandno + (reslevelno 0)]; +// band-f_stepsize = SHL(2048 + qntsty-mant[gbandno], +//2 + numbps - qntsty-expn[gbandno]); +// break; case JPEG2000_QSTY_SE: /* Exponent quantization step. * Formula: ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2'
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9 18:08:41 2015 +0200| [962654f25137ee8a8f75625ee8f5440db060fc9f] | committer: Michael Niedermayer Merge commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2' * commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2': mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail See: 1382add59df149193620ca0714ceac0929208c88 Merged-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=962654f25137ee8a8f75625ee8f5440db060fc9f --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] imc: add required padding for GetBitContext buffer
ffmpeg | branch: master | Janne Grunau janne-li...@jannau.net | Mon Jun 8
14:48:54 2015 +0200| [210921722bf828b3b895ebcbc34374e6c4452c6f] | committer:
Janne Grunau
imc: add required padding for GetBitContext buffer
Fixes stack buffer overflow errors detected by address sanitizer in
fate-imc.
CC: libav-sta...@libav.org
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=210921722bf828b3b895ebcbc34374e6c4452c6f
---
libavcodec/imc.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index 411bc85..c60fc7a 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -997,7 +997,7 @@ static int imc_decode_frame(AVCodecContext *avctx, void
*data,
IMCContext *q = avctx-priv_data;
-LOCAL_ALIGNED_16(uint16_t, buf16, [IMC_BLOCK_SIZE / 2]);
+LOCAL_ALIGNED_16(uint16_t, buf16, [(IMC_BLOCK_SIZE +
FF_INPUT_BUFFER_PADDING_SIZE) / 2]);
if (buf_size IMC_BLOCK_SIZE * avctx-channels) {
av_log(avctx, AV_LOG_ERROR, frame too small!\n);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '210921722bf828b3b895ebcbc34374e6c4452c6f'
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9 17:43:24 2015 +0200| [551813a963b2c04d0211a6c87ecd400bdcf2c5f7] | committer: Michael Niedermayer Merge commit '210921722bf828b3b895ebcbc34374e6c4452c6f' * commit '210921722bf828b3b895ebcbc34374e6c4452c6f': imc: add required padding for GetBitContext buffer Conflicts: libavcodec/imc.c See: 7444cf9a9c0b8b2bba8198af2823521c654a48f4 Merged-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=551813a963b2c04d0211a6c87ecd400bdcf2c5f7 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] mpjpegdec: don' t try to alloc an AVIOContext when probe is guaranteed to fail
ffmpeg | branch: master | James Almer jamr...@gmail.com | Mon Jun 8 17:19:25
2015 -0300| [b380337020e271c5431aa8ef8f8e9dfda5e919b2] | committer: Janne Grunau
mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail
The first check is done without the AVIOContext, so alloc it only if said check
succeeds
Signed-off-by: James Almer jamr...@gmail.com
Signed-off-by: Janne Grunau janne-li...@jannau.net
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b380337020e271c5431aa8ef8f8e9dfda5e919b2
---
libavformat/mpjpegdec.c |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
index 72891e7..e2a2ece 100644
--- a/libavformat/mpjpegdec.c
+++ b/libavformat/mpjpegdec.c
@@ -83,13 +83,13 @@ static int mpjpeg_read_probe(AVProbeData *p)
char line[128] = { 0 };
int ret = 0;
+if (p-buf_size 2 || p-buf[0] != '-' || p-buf[1] != '-')
+return 0;
+
pb = avio_alloc_context(p-buf, p-buf_size, 0, NULL, NULL, NULL, NULL);
if (!pb)
return AVERROR(ENOMEM);
-if (p-buf_size 2 || p-buf[0] != '-' || p-buf[1] != '-')
-goto end;
-
while (!pb-eof_reached) {
ret = get_line(pb, line, sizeof(line));
if (ret 0)
@@ -101,7 +101,7 @@ static int mpjpeg_read_probe(AVProbeData *p)
break;
}
}
-end:
+
av_free(pb);
return ret;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] mkv: Correctly report the latest packet had been flushed
ffmpeg | branch: master | Luca Barbato lu_z...@gentoo.org | Tue Jun 9 10:47:11 2015 +0200| [b14086ca38efa1a86cb0f0c6aa147b05f698877b] | committer: Luca Barbato mkv: Correctly report the latest packet had been flushed Bug-Id: 865 CC: libav-sta...@libav.org http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b14086ca38efa1a86cb0f0c6aa147b05f698877b --- libavformat/matroskaenc.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 91c4459..b1c0020 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1630,7 +1630,7 @@ static int mkv_write_flush_packet(AVFormatContext *s, AVPacket *pkt) mkv_flush_dynbuf(s); avio_flush(s-pb); } -return 0; +return 1; } return mkv_write_packet(s, pkt); } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b'
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9 18:18:38 2015 +0200| [dac7b278026401a67795181c22f6eaaf72095074] | committer: Michael Niedermayer Merge commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b' * commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b': mkv: Correctly report the latest packet had been flushed Merged-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dac7b278026401a67795181c22f6eaaf72095074 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/jpeg2000: remove unused variable
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9
18:48:39 2015 +0200| [dbbb31e5bb8889e96506a0831f2f34ea58dec8de] | committer:
Michael Niedermayer
avcodec/jpeg2000: remove unused variable
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dbbb31e5bb8889e96506a0831f2f34ea58dec8de
---
libavcodec/jpeg2000.c |1 -
1 file changed, 1 deletion(-)
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c
index 1717bc3..38df58d 100644
--- a/libavcodec/jpeg2000.c
+++ b/libavcodec/jpeg2000.c
@@ -286,7 +286,6 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
* see ISO/IEC 15444-1:2002 E.1 and A.6.4. */
switch (qntsty-quantsty) {
uint8_t gain;
-int numbps;
case JPEG2000_QSTY_NONE:
/* TODO: to verify. No quantization in this case */
band-f_stepsize = 1;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/oggenc: Fix return code in case of flushing
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9 18:42:55 2015 +0200| [32b1131fc16e1ff86f62632d13ca4c49070e012a] | committer: Michael Niedermayer avformat/oggenc: Fix return code in case of flushing Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32b1131fc16e1ff86f62632d13ca4c49070e012a --- libavformat/oggenc.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 873dfac..2c0a44e 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -620,7 +620,7 @@ static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt) } ogg_write_pages(s, 2); -return 0; +return 1; } static int ogg_write_trailer(AVFormatContext *s) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/jpeg2000dec: Fix gain regression with gray16
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9
20:26:38 2015 +0200| [0916938a8dfac27096ed9f6873d32e24fa5f87c9] | committer:
Michael Niedermayer
avcodec/jpeg2000dec: Fix gain regression with gray16
Found-by: carl
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0916938a8dfac27096ed9f6873d32e24fa5f87c9
---
libavcodec/jpeg2000dec.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index aecc6eb..24cb8a1 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1330,7 +1330,8 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext
*s, Jpeg2000Tile *tile,
}
}
} else {
-int precision = picture-format == AV_PIX_FMT_XYZ12 ? 16 :
s-precision;
+int precision = picture-format == AV_PIX_FMT_XYZ12 ||
+picture-format == AV_PIX_FMT_GRAY16 ? 16 :
s-precision;
for (compno = 0; compno s-ncomponents; compno++) {
Jpeg2000Component *comp = tile-comp + compno;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] fate: Force jpeg2000 decoder for dcinema
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9 19:32:55 2015 +0200| [6bf8d9e1649da468e331c81b5948b752d0b687a7] | committer: Michael Niedermayer fate: Force jpeg2000 decoder for dcinema so that no external decoder is used which would break the test Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6bf8d9e1649da468e331c81b5948b752d0b687a7 --- tests/fate/video.mak |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index d07ff40..9f65694 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -187,7 +187,7 @@ FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit fate-interplay-mve-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema -fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le +fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -vcodec jpeg2000 -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le FATE_VIDEO-$(call DEMDEC, JV, JV) += fate-jv fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -an -pix_fmt rgb24 ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/libopenjpegdec: Mark as experimental if = 1.3
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9
03:35:07 2015 +0200| [adbe1d7de4463922042012f191136ccc776d8302] | committer:
Michael Niedermayer
avcodec/libopenjpegdec: Mark as experimental if = 1.3
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=adbe1d7de4463922042012f191136ccc776d8302
---
libavcodec/libopenjpegdec.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index 8fe7a50..7f28e87 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -433,6 +433,15 @@ done:
return ret;
}
+static av_cold void libopenjpeg_static_init(AVCodec *codec)
+{
+const char *version = opj_version();
+int major, minor;
+
+if (sscanf(version, %d.%d, major, minor) == 2 1000*major + minor =
1003)
+codec-capabilities |= CODEC_CAP_EXPERIMENTAL;
+}
+
#define OFFSET(x) offsetof(LibOpenJPEGContext, x)
#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
@@ -460,4 +469,5 @@ AVCodec ff_libopenjpeg_decoder = {
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.max_lowres = 31,
.priv_class = openjpeg_class,
+.init_static_data = libopenjpeg_static_init,
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavf/webm_chunk: Remove AVFMT_ALLOW_FLUSH
ffmpeg | branch: master | Vignesh Venkatasubramanian vigne...@google.com |
Tue Jun 9 10:02:56 2015 -0700| [34ae98a771891611c6e98c6fc2652868529901bd] |
committer: Michael Niedermayer
lavf/webm_chunk: Remove AVFMT_ALLOW_FLUSH
The flag was set unintentionally and the code will break if a NULL
packet is passed in.
Signed-off-by: Vignesh Venkatasubramanian vigne...@google.com
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34ae98a771891611c6e98c6fc2652868529901bd
---
libavformat/webm_chunk.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c
index c7cc0b8..3dfef4b 100644
--- a/libavformat/webm_chunk.c
+++ b/libavformat/webm_chunk.c
@@ -256,7 +256,7 @@ AVOutputFormat ff_webm_chunk_muxer = {
.mime_type = video/webm,
.extensions = chk,
.flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER | AVFMT_NEEDNUMBER |
- AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH,
+ AVFMT_TS_NONSTRICT,
.priv_data_size = sizeof(WebMChunkContext),
.write_header = webm_chunk_write_header,
.write_packet = webm_chunk_write_packet,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Changelog: Add 2.7 entry
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9 23:14:57 2015 +0200| [3a99f6e79fa3ac4d280f52fddbc234a56d78a488] | committer: Michael Niedermayer Changelog: Add 2.7 entry Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a99f6e79fa3ac4d280f52fddbc234a56d78a488 --- Changelog |3 +++ 1 file changed, 3 insertions(+) diff --git a/Changelog b/Changelog index 9179422..aa5753e 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,9 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. version next: + + +version 2.7: - FFT video filter - TDSC decoder - DTS lossless extension (XLL) decoding (not lossless, disabled by default) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libavutil/channel_layout: Correctly return layout when channel specification ends with a trailing ' c'.
ffmpeg | branch: master | Simon Thelen ffmpeg-...@c-14.de | Tue Jun 9
04:55:57 2015 +0200| [83307a32eb0c9f0843f655c44bb65e3e999153f8] | committer:
Michael Niedermayer
libavutil/channel_layout: Correctly return layout when channel specification
ends with a trailing 'c'.
Return layout when FF_API_GET_CHANNEL_LAYOUT_COMPAT is set even if the
layout itself is not in the deprecated style.
Signed-off-by: Simon Thelen ffmpeg-...@c-14.de
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83307a32eb0c9f0843f655c44bb65e3e999153f8
---
libavutil/channel_layout.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
index 4c0677f..cd5cf42 100644
--- a/libavutil/channel_layout.c
+++ b/libavutil/channel_layout.c
@@ -138,8 +138,8 @@ static uint64_t get_channel_layout_single(const char *name,
int name_len)
switch to the syntax '%.*sc' otherwise it will be
interpreted as a
channel layout number in a later version\n,
name_len, name, name_len, name);
-return layout;
}
+return layout;
}
} else {
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/jpeg2000dec: Handle Psot = 0
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 9
14:43:03 2015 +0200| [b6ee1912f98d1db5f31b5d0c182181b79d9233df] | committer:
Michael Niedermayer
avcodec/jpeg2000dec: Handle Psot = 0
Fixes Ticket2869
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6ee1912f98d1db5f31b5d0c182181b79d9233df
---
libavcodec/jpeg2000dec.c |3 +++
1 file changed, 3 insertions(+)
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index ba0d259..c5a3bd2 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -602,6 +602,9 @@ static int get_sot(Jpeg2000DecoderContext *s, int n)
/* Read TNSot but not used */
bytestream2_get_byteu(s-g); // TNsot
+if (!Psot)
+Psot = bytestream2_get_bytes_left(s-g) + n + 2;
+
if (Psot bytestream2_get_bytes_left(s-g) + n + 2) {
av_log(s-avctx, AV_LOG_ERROR, Psot %PRIu32 too big\n, Psot);
return AVERROR_INVALIDDATA;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. b67a849 web/security: list CVE betweeen 2.6 - 2.7
The branch, master has been updated via b67a849c9ee2c9953d993c7f71ea6f1492c306c3 (commit) from 7c05a8a611c9992d3ae193d5af9e807eb0321224 (commit) - Log - commit b67a849c9ee2c9953d993c7f71ea6f1492c306c3 Author: Michael Niedermayer michae...@gmx.at AuthorDate: Wed Jun 10 04:00:51 2015 +0200 Commit: Michael Niedermayer michae...@gmx.at CommitDate: Wed Jun 10 04:00:51 2015 +0200 web/security: list CVE betweeen 2.6 - 2.7 diff --git a/src/security b/src/security index a012518..67f2ec5 100644 --- a/src/security +++ b/src/security @@ -1,5 +1,16 @@ pPlease report vulnerabilities to a href=mailto:ffmpeg-secur...@ffmpeg.org;ffmpeg-secur...@ffmpeg.org/a/p +h2FFmpeg 2.7/h2 + +h32.7/h3 +p +Fixes following vulnerabilities: +/p +pre +CVE-2015-3395 f7e1367f58263593e6cee3c282f7277d7ee9d553 +/pre + + h2FFmpeg 2.6/h2 h32.6.2/h3 --- Summary of changes: src/security | 11 +++ 1 file changed, 11 insertions(+) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
