August 2013 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/pngdsp: fix (un)signed type in end comparission
by git＠videolan.org 30 Aug '13

30 Aug '13

ffmpeg | branch: release/2.0 | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 30 23:14:32 2013 +0200| [a4522ae516b58175c447b65cb44536db08f82552] | committer: Carl Eugen Hoyos avcodec/pngdsp: fix (un)signed type in end comparission Fixes out of array accesses Fixes Ticket2919 Found_by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 86736f59d6a527d8bc807d09b93f971c0fe0bb07) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4522ae516b58175c… --- libavcodec/pngdsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pngdsp.c b/libavcodec/pngdsp.c index 0d24775..5ab1c35 100644 --- a/libavcodec/pngdsp.c +++ b/libavcodec/pngdsp.c @@ -31,7 +31,7 @@ static void add_bytes_l2_c(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w) { long i; - for (i = 0; i <= w - sizeof(long); i += sizeof(long)) { + for (i = 0; i <= w - (int)sizeof(long); i += sizeof(long)) { long a = *(long *)(src1 + i); long b = *(long *)(src2 + i); *(long *)(dst + i) = ((a & pb_7f) + (b & pb_7f)) ^ ((a ^ b) & pb_80);

1 0

avcodec/pngdsp: fix (un)signed type in end comparission
by git＠videolan.org 30 Aug '13

30 Aug '13

ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 30 23:14:32 2013 +0200| [ddce97c7b0e460bafa0e7da72b6c4b8193f23cda] | committer: Carl Eugen Hoyos avcodec/pngdsp: fix (un)signed type in end comparission Fixes out of array accesses Fixes Ticket2919 Found_by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 86736f59d6a527d8bc807d09b93f971c0fe0bb07) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddce97c7b0e460baf… --- libavcodec/pngdsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pngdsp.c b/libavcodec/pngdsp.c index 1ee8b57..38ee458 100644 --- a/libavcodec/pngdsp.c +++ b/libavcodec/pngdsp.c @@ -30,7 +30,7 @@ static void add_bytes_l2_c(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w) { long i; - for (i = 0; i <= w - sizeof(long); i += sizeof(long)) { + for (i = 0; i <= w - (int)sizeof(long); i += sizeof(long)) { long a = *(long *)(src1 + i); long b = *(long *)(src2 + i); *(long *)(dst + i) = ((a & pb_7f) + (b & pb_7f)) ^ ((a ^ b) & pb_80);

1 0

avcodec/pngdsp: fix (un)signed type in end comparission
by git＠videolan.org 30 Aug '13

30 Aug '13

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 30 23:14:32 2013 +0200| [a2e7fd406c5b1d9095fe198c72007e4136ef5e93] | committer: Carl Eugen Hoyos avcodec/pngdsp: fix (un)signed type in end comparission Fixes out of array accesses Fixes Ticket2919 Found_by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 86736f59d6a527d8bc807d09b93f971c0fe0bb07) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2e7fd406c5b1d909… --- libavcodec/pngdsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pngdsp.c b/libavcodec/pngdsp.c index 1ee8b57..38ee458 100644 --- a/libavcodec/pngdsp.c +++ b/libavcodec/pngdsp.c @@ -30,7 +30,7 @@ static void add_bytes_l2_c(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w) { long i; - for (i = 0; i <= w - sizeof(long); i += sizeof(long)) { + for (i = 0; i <= w - (int)sizeof(long); i += sizeof(long)) { long a = *(long *)(src1 + i); long b = *(long *)(src2 + i); *(long *)(dst + i) = ((a & pb_7f) + (b & pb_7f)) ^ ((a ^ b) & pb_80);

1 0

avcodec/pngdsp: fix (un)signed type in end comparission
by git＠videolan.org 30 Aug '13

30 Aug '13

ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 30 23:14:32 2013 +0200| [5bd2b24db399d9821a0396f96dc8e2392d80abe1] | committer: Carl Eugen Hoyos avcodec/pngdsp: fix (un)signed type in end comparission Fixes out of array accesses Fixes Ticket2919 Found_by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 86736f59d6a527d8bc807d09b93f971c0fe0bb07) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bd2b24db399d9821… --- libavcodec/pngdsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pngdsp.c b/libavcodec/pngdsp.c index 75ec996..eb8c6b2 100644 --- a/libavcodec/pngdsp.c +++ b/libavcodec/pngdsp.c @@ -30,7 +30,7 @@ static void add_bytes_l2_c(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w) { long i; - for (i = 0; i <= w - sizeof(long); i += sizeof(long)) { + for (i = 0; i <= w - (int)sizeof(long); i += sizeof(long)) { long a = *(long *)(src1 + i); long b = *(long *)(src2 + i); *(long *)(dst + i) = ((a & pb_7f) + (b & pb_7f)) ^ ((a ^ b) & pb_80);

1 0

avcodec/pngdsp: fix (un)signed type in end comparission
by git＠videolan.org 30 Aug '13

30 Aug '13

ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 30 23:14:32 2013 +0200| [2d945ac68f7a515b1bdf77e2766ff398d843bbe6] | committer: Carl Eugen Hoyos avcodec/pngdsp: fix (un)signed type in end comparission Fixes out of array accesses Fixes Ticket2919 Found_by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 86736f59d6a527d8bc807d09b93f971c0fe0bb07) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d945ac68f7a515b1… --- libavcodec/pngdsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pngdsp.c b/libavcodec/pngdsp.c index 75ec996..eb8c6b2 100644 --- a/libavcodec/pngdsp.c +++ b/libavcodec/pngdsp.c @@ -30,7 +30,7 @@ static void add_bytes_l2_c(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w) { long i; - for (i = 0; i <= w - sizeof(long); i += sizeof(long)) { + for (i = 0; i <= w - (int)sizeof(long); i += sizeof(long)) { long a = *(long *)(src1 + i); long b = *(long *)(src2 + i); *(long *)(dst + i) = ((a & pb_7f) + (b & pb_7f)) ^ ((a ^ b) & pb_80);

1 0

avcodec/pngdsp: fix (un)signed type in end comparission
by git＠videolan.org 30 Aug '13

30 Aug '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 30 23:14:32 2013 +0200| [86736f59d6a527d8bc807d09b93f971c0fe0bb07] | committer: Michael Niedermayer avcodec/pngdsp: fix (un)signed type in end comparission Fixes out of array accesses Fixes Ticket2919 Found_by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86736f59d6a527d8b… --- libavcodec/pngdsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pngdsp.c b/libavcodec/pngdsp.c index 0d24775..5ab1c35 100644 --- a/libavcodec/pngdsp.c +++ b/libavcodec/pngdsp.c @@ -31,7 +31,7 @@ static void add_bytes_l2_c(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w) { long i; - for (i = 0; i <= w - sizeof(long); i += sizeof(long)) { + for (i = 0; i <= w - (int)sizeof(long); i += sizeof(long)) { long a = *(long *)(src1 + i); long b = *(long *)(src2 + i); *(long *)(dst + i) = ((a & pb_7f) + (b & pb_7f)) ^ ((a ^ b) & pb_80);

1 0

lavu/bprint: add append buffer function
by git＠videolan.org 30 Aug '13

30 Aug '13

ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki(a)gmail.com> | Fri Aug 23 23:21:50 2013 +0200| [0b46d6f3efa7c647a42d3e77d09c274f611b752b] | committer: Michael Niedermayer lavu/bprint: add append buffer function Signed-off-by: Lukasz Marek <lukasz.m.luki(a)gmail.com> Reveiwed-by: Nicolas George <nicolas.george(a)normalesup.org> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b46d6f3efa7c647a… --- libavutil/bprint.c | 18 ++++++++++++++++++ libavutil/bprint.h | 9 +++++++++ libavutil/version.h | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/libavutil/bprint.c b/libavutil/bprint.c index cd91bc4..7786e3b 100644 --- a/libavutil/bprint.c +++ b/libavutil/bprint.c @@ -155,6 +155,24 @@ void av_bprint_chars(AVBPrint *buf, char c, unsigned n) av_bprint_grow(buf, n); } +void av_bprint_append_data(AVBPrint *buf, const char *data, unsigned size) +{ + unsigned room, real_n; + + while (1) { + room = av_bprint_room(buf); + if (size < room) + break; + if (av_bprint_alloc(buf, size)) + break; + } + if (room) { + real_n = FFMIN(size, room - 1); + memcpy(buf->str + buf->len, data, real_n); + } + av_bprint_grow(buf, size); +} + void av_bprint_strftime(AVBPrint *buf, const char *fmt, const struct tm *tm) { unsigned room; diff --git a/libavutil/bprint.h b/libavutil/bprint.h index bb1de25..839ec1e 100644 --- a/libavutil/bprint.h +++ b/libavutil/bprint.h @@ -133,6 +133,15 @@ void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg); */ void av_bprint_chars(AVBPrint *buf, char c, unsigned n); +/** + * Append data to a print buffer. + * + * param buf bprint buffer to use + * param data pointer to data + * param size size of data + */ +void av_bprint_append_data(AVBPrint *buf, const char *data, unsigned size); + struct tm; /** * Append a formatted date and time to a print buffer. diff --git a/libavutil/version.h b/libavutil/version.h index e522b79..7aec9c0 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 42 +#define LIBAVUTIL_VERSION_MINOR 43 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

1 0

avcodec/avpacket: Use av_free_packet() in error cleanups
by git＠videolan.org 30 Aug '13

30 Aug '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 30 20:57:55 2013 +0200| [6e1b1a27a4034c578018d5042b3c8228278c4cd6] | committer: Michael Niedermayer avcodec/avpacket: Use av_free_packet() in error cleanups This prevents memleaks on errors reproduceable with fate when error pathes are forced Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e1b1a27a4034c578… --- libavcodec/avpacket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 7196c31..b6b4109 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -215,7 +215,7 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; failed_alloc: - av_destruct_packet(pkt); + av_free_packet(pkt); return AVERROR(ENOMEM); } @@ -237,7 +237,7 @@ int av_copy_packet_side_data(AVPacket *pkt, AVPacket *src) return 0; failed_alloc: - av_destruct_packet(pkt); + av_free_packet(pkt); return AVERROR(ENOMEM); }

1 0

vformat/subtitles: check av_copy_packets return code
by git＠videolan.org 30 Aug '13

30 Aug '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 30 20:57:04 2013 +0200| [5c504e4df7b4abe6e54d0be3e327b65348267906] | committer: Michael Niedermayer vformat/subtitles: check av_copy_packets return code Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c504e4df7b4abe6e… --- libavformat/subtitles.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c index 2af0450..21d68a9 100644 --- a/libavformat/subtitles.c +++ b/libavformat/subtitles.c @@ -85,7 +85,9 @@ int ff_subtitles_queue_read_packet(FFDemuxSubtitlesQueue *q, AVPacket *pkt) if (q->current_sub_idx == q->nb_subs) return AVERROR_EOF; - av_copy_packet(pkt, sub); + if (av_copy_packet(pkt, sub) < 0) { + return AVERROR(ENOMEM); + } pkt->dts = pkt->pts; q->current_sub_idx++;

1 0

kgv1dec: remove unused avctx from codec private context
by git＠videolan.org 30 Aug '13

30 Aug '13

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Aug 30 13:16:50 2013 +0000| [c04268447627e3845b5aea5432b502d457d959f4] | committer: Paul B Mahol kgv1dec: remove unused avctx from codec private context Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c04268447627e3845… --- libavcodec/kgv1dec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c index 9064897..bf1010f 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -31,7 +31,6 @@ #include "internal.h" typedef struct { - AVCodecContext *avctx; AVFrame *prev; } KgvContext; @@ -158,7 +157,6 @@ static av_cold int decode_init(AVCodecContext *avctx) { KgvContext * const c = avctx->priv_data; - c->avctx = avctx; avctx->pix_fmt = AV_PIX_FMT_RGB555; avctx->flags |= CODEC_FLAG_EMU_EDGE;

1 0