March 2015 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/png: Clearly separate encoding header and frames
by git＠videolan.org 31 Mar '15

31 Mar '15

ffmpeg | branch: master | Donny Yang <work(a)kota.moe> | Tue Mar 31 20:58:25 2015 +0000| [3c912391dd137f348bd2c4516ae66182748224f9] | committer: Michael Niedermayer avcodec/png: Clearly separate encoding header and frames Signed-off-by: Donny Yang <work(a)kota.moe> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c912391dd137f348… --- libavcodec/pngenc.c | 142 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 84 insertions(+), 58 deletions(-) diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index c913cce..bf7c49e 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -291,58 +291,11 @@ static int png_get_gama(enum AVColorTransferCharacteristic trc, uint8_t *buf) return 1; } -static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, - const AVFrame *pict, int *got_packet) +static int encode_headers(AVCodecContext *avctx, const AVFrame *pict) { - PNGEncContext *s = avctx->priv_data; - const AVFrame *const p = pict; - int y, len, row_size, ret; - int pass_row_size, enc_row_size; - int64_t max_packet_size; - uint8_t *ptr, *top, *crow_buf, *crow; - uint8_t *crow_base = NULL; - uint8_t *progressive_buf = NULL; - uint8_t *top_buf = NULL; - - row_size = (avctx->width * s->bits_per_pixel + 7) >> 3; - - enc_row_size = deflateBound(&s->zstream, row_size); - max_packet_size = - FF_MIN_BUFFER_SIZE + // headers - avctx->height * ( - enc_row_size + - 12 * (((int64_t)enc_row_size + IOBUF_SIZE - 1) / IOBUF_SIZE) // IDAT * ceil(enc_row_size / IOBUF_SIZE) - ); - if (max_packet_size > INT_MAX) - return AVERROR(ENOMEM); - ret = ff_alloc_packet2(avctx, pkt, max_packet_size); - if (ret < 0) - return ret; - - s->bytestream_start = - s->bytestream = pkt->data; - s->bytestream_end = pkt->data + pkt->size; - - crow_base = av_malloc((row_size + 32) << (s->filter_type == PNG_FILTER_VALUE_MIXED)); - if (!crow_base) { - ret = AVERROR(ENOMEM); - goto the_end; - } - // pixel data should be aligned, but there's a control byte before it - crow_buf = crow_base + 15; - if (s->is_progressive) { - progressive_buf = av_malloc(row_size + 1); - top_buf = av_malloc(row_size + 1); - if (!progressive_buf || !top_buf) { - ret = AVERROR(ENOMEM); - goto the_end; - } - } + PNGEncContext *s = avctx->priv_data; /* write png header */ - AV_WB64(s->bytestream, PNGSIG); - s->bytestream += 8; - AV_WB32(s->buf, avctx->width); AV_WB32(s->buf + 4, avctx->height); s->buf[8] = s->bit_depth; @@ -381,9 +334,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, int has_alpha, alpha, i; unsigned int v; uint32_t *palette; - uint8_t *alpha_ptr; + uint8_t *ptr, *alpha_ptr; - palette = (uint32_t *)p->data[1]; + palette = (uint32_t *)pict->data[1]; ptr = s->buf; alpha_ptr = s->buf + 256 * 3; has_alpha = 0; @@ -403,7 +356,39 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, } } - /* now put each row */ + return 0; +} + +static int encode_frame(AVCodecContext *avctx, const AVFrame *pict) +{ + PNGEncContext *s = avctx->priv_data; + const AVFrame *const p = pict; + int y, len, ret; + int row_size, pass_row_size; + uint8_t *ptr, *top, *crow_buf, *crow; + uint8_t *crow_base = NULL; + uint8_t *progressive_buf = NULL; + uint8_t *top_buf = NULL; + + row_size = (avctx->width * s->bits_per_pixel + 7) >> 3; + + crow_base = av_malloc((row_size + 32) << (s->filter_type == PNG_FILTER_VALUE_MIXED)); + if (!crow_base) { + ret = AVERROR(ENOMEM); + goto the_end; + } + // pixel data should be aligned, but there's a control byte before it + crow_buf = crow_base + 15; + if (s->is_progressive) { + progressive_buf = av_malloc(row_size + 1); + top_buf = av_malloc(row_size + 1); + if (!progressive_buf || !top_buf) { + ret = AVERROR(ENOMEM); + goto the_end; + } + } + + /* put each row */ s->zstream.avail_out = IOBUF_SIZE; s->zstream.next_out = s->buf; if (s->is_progressive) { @@ -456,12 +441,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, goto the_end; } } - png_write_chunk(&s->bytestream, MKTAG('I', 'E', 'N', 'D'), NULL, 0); - pkt->size = s->bytestream - s->bytestream_start; - pkt->flags |= AV_PKT_FLAG_KEY; - *got_packet = 1; - ret = 0; + ret = 0; the_end: av_freep(&crow_base); @@ -471,6 +452,51 @@ the_end: return ret; } +static int encode(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *pict, int *got_packet) +{ + PNGEncContext *s = avctx->priv_data; + int ret; + int enc_row_size; + size_t max_packet_size; + + enc_row_size = deflateBound(&s->zstream, (avctx->width * s->bits_per_pixel + 7) >> 3); + max_packet_size = + FF_MIN_BUFFER_SIZE + // headers + avctx->height * ( + enc_row_size + + 12 * (((int64_t)enc_row_size + IOBUF_SIZE - 1) / IOBUF_SIZE) // IDAT * ceil(enc_row_size / IOBUF_SIZE) + ); + if (max_packet_size > INT_MAX) + return AVERROR(ENOMEM); + ret = ff_alloc_packet2(avctx, pkt, max_packet_size); + if (ret < 0) + return ret; + + s->bytestream_start = + s->bytestream = pkt->data; + s->bytestream_end = pkt->data + pkt->size; + + AV_WB64(s->bytestream, PNGSIG); + s->bytestream += 8; + + ret = encode_headers(avctx, pict); + if (ret < 0) + return ret; + + ret = encode_frame(avctx, pict); + if (ret < 0) + return ret; + + png_write_chunk(&s->bytestream, MKTAG('I', 'E', 'N', 'D'), NULL, 0); + + pkt->size = s->bytestream - s->bytestream_start; + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; + + return 0; +} + static av_cold int png_enc_init(AVCodecContext *avctx) { PNGEncContext *s = avctx->priv_data; @@ -606,7 +632,7 @@ AVCodec ff_png_encoder = { .priv_data_size = sizeof(PNGEncContext), .init = png_enc_init, .close = png_enc_close, - .encode2 = encode_frame, + .encode2 = encode, .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA,

1 0

lavu/avstring: add av_append_path_component() funcion
by git＠videolan.org 31 Mar '15

31 Mar '15

ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki2(a)gmail.com> | Sat Jul 5 18:12:02 2014 +0200| [31886968d338e8657f38c0e7c15ac269a8ca0880] | committer: Michael Niedermayer lavu/avstring: add av_append_path_component() funcion Convinient function to build paths. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31886968d338e8657… --- doc/APIchanges | 3 +++ libavutil/avstring.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ libavutil/avstring.h | 10 ++++++++++ libavutil/version.h | 2 +- tests/ref/fate/avstring | 9 +++++++++ 5 files changed, 68 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index f8dcc99..b1beb9d 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2014-08-09 API changes, most recent first: +2015-xx-xx - xxxxxxx - lavu 54.22.100 - avstring.h + Add av_append_path_component() + 2015-03-27 - 184084c - lavf 56.27.100 - avio.h url.h New directory listing API. diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 25c65b4..670801e 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -269,6 +269,37 @@ const char *av_dirname(char *path) return path; } +char *av_append_path_component(const char *path, const char *component) +{ + size_t p_len, c_len; + char *fullpath; + + if (!path) + return av_strdup(component); + if (!component) + return av_strdup(path); + + p_len = strlen(path); + c_len = strlen(component); + if (p_len > SIZE_MAX - c_len || p_len + c_len > SIZE_MAX - 2) + return NULL; + fullpath = av_malloc(p_len + c_len + 2); + if (fullpath) { + if (p_len) { + av_strlcpy(fullpath, path, p_len + 1); + if (c_len) { + if (fullpath[p_len - 1] != '/' && component[0] != '/') + fullpath[p_len++] = '/'; + else if (fullpath[p_len - 1] == '/' && component[0] == '/') + p_len--; + } + } + av_strlcpy(&fullpath[p_len], component, c_len + 1); + fullpath[p_len + c_len] = 0; + } + return fullpath; +} + int av_escape(char **dst, const char *src, const char *special_chars, enum AVEscapeMode mode, int flags) { @@ -427,6 +458,7 @@ int av_match_list(const char *name, const char *list, char separator) int main(void) { int i; + char *fullpath; static const char * const strings[] = { "''", "", @@ -467,6 +499,19 @@ int main(void) av_free(q); } + printf("Testing av_append_path_component()\n"); + #define TEST_APPEND_PATH_COMPONENT(path, component, expected) \ + fullpath = av_append_path_component((path), (component)); \ + printf("%s = %s\n", fullpath, expected); \ + av_free(fullpath); + TEST_APPEND_PATH_COMPONENT(NULL, NULL, "(null)") + TEST_APPEND_PATH_COMPONENT("path", NULL, "path"); + TEST_APPEND_PATH_COMPONENT(NULL, "comp", "comp"); + TEST_APPEND_PATH_COMPONENT("path", "comp", "path/comp"); + TEST_APPEND_PATH_COMPONENT("path/", "comp", "path/comp"); + TEST_APPEND_PATH_COMPONENT("path", "/comp", "path/comp"); + TEST_APPEND_PATH_COMPONENT("path/", "/comp", "path/comp"); + TEST_APPEND_PATH_COMPONENT("path/path2/", "/comp/comp2", "path/path2/comp/comp2"); return 0; } diff --git a/libavutil/avstring.h b/libavutil/avstring.h index ffb7aa6..466edaf 100644 --- a/libavutil/avstring.h +++ b/libavutil/avstring.h @@ -276,6 +276,16 @@ const char *av_dirname(char *path); */ int av_match_name(const char *name, const char *names); +/** + * Append path component to the existing path. + * Path separator '/' is placed between when needed. + * Resulting string have to be freed with av_free(). + * @param path base path + * @param component component to be appended + * @return new path or NULL on error. + */ +char *av_append_path_component(const char *path, const char *component); + enum AVEscapeMode { AV_ESCAPE_MODE_AUTO, ///< Use auto-selected escaping mode. AV_ESCAPE_MODE_BACKSLASH, ///< Use backslash escaping. diff --git a/libavutil/version.h b/libavutil/version.h index 4d710dd..30be0f0 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 21 +#define LIBAVUTIL_VERSION_MINOR 22 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/tests/ref/fate/avstring b/tests/ref/fate/avstring index bc231e8..1ca9be5 100644 --- a/tests/ref/fate/avstring +++ b/tests/ref/fate/avstring @@ -25,3 +25,12 @@ Testing av_get_token() |'foo : \ \ ' : blahblah| -> |foo : \ \ | + |: blahblah| |'\fo\o:': blahblah| -> |\fo\o:| + |: blahblah| |\'fo\o\:': foo ' :blahblah| -> |'foo:: foo | + |:blahblah| +Testing av_append_path_component() +(null) = (null) +path = path +comp = comp +path/comp = path/comp +path/comp = path/comp +path/comp = path/comp +path/comp = path/comp +path/path2/comp/comp2 = path/path2/comp/comp2

1 0

avformat/mp3dec: offset seek index to end of id3v2 tag
by git＠videolan.org 31 Mar '15

31 Mar '15

ffmpeg | branch: master | wm4 <nfxjfg(a)googlemail.com> | Tue Mar 31 22:47:37 2015 +0200| [8b76c0eb561b0313e2a27950fe9d2bc5e4780dd8] | committer: Michael Niedermayer avformat/mp3dec: offset seek index to end of id3v2 tag The Xing index won't account for the id3 tag - it's relative to the headers. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b76c0eb561b0313e… --- libavformat/mp3dec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index d2498a0..161f27d 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -106,7 +106,7 @@ static int mp3_read_probe(AVProbeData *p) //mpegps_mp3_unrecognized_format.mpg has max_frames=3 } -static void read_xing_toc(AVFormatContext *s, int64_t filesize, int64_t duration) +static void read_xing_toc(AVFormatContext *s, int64_t base, int64_t filesize, int64_t duration) { int i; MP3DecContext *mp3 = s->priv_data; @@ -122,7 +122,7 @@ static void read_xing_toc(AVFormatContext *s, int64_t filesize, int64_t duration uint8_t b = avio_r8(s->pb); if (fill_index) av_add_index_entry(s->streams[0], - av_rescale(b, filesize, 256), + av_rescale(b, filesize, 256) + base, av_rescale(i, duration, XING_TOC_COUNT), 0, 0, AVINDEX_KEYFRAME); } @@ -130,7 +130,7 @@ static void read_xing_toc(AVFormatContext *s, int64_t filesize, int64_t duration mp3->xing_toc = 1; } -static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st, +static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st, int64_t base, MPADecodeHeader *c, uint32_t spf) { #define LAST_BITS(k, n) ((k) & ((1 << (n)) - 1)) @@ -172,7 +172,7 @@ static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st, } } if (v & XING_FLAG_TOC) - read_xing_toc(s, mp3->header_filesize, av_rescale_q(mp3->frames, + read_xing_toc(s, base, mp3->header_filesize, av_rescale_q(mp3->frames, (AVRational){spf, c->sample_rate}, st->time_base)); /* VBR quality */ @@ -310,7 +310,7 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base) mp3->frames = 0; mp3->header_filesize = 0; - mp3_parse_info_tag(s, st, &c, spf); + mp3_parse_info_tag(s, st, base, &c, spf); mp3_parse_vbri_tag(s, st, base); if (!mp3->frames && !mp3->header_filesize)

1 0

avcodec/libx265: export choosen picture types
by git＠videolan.org 31 Mar '15

31 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Mar 31 00:37:46 2015 +0200| [2ddedfd39c0d6b49e6396c535d5cb21846676a13] | committer: Michael Niedermayer avcodec/libx265: export choosen picture types Fixes part of ticket 4285 Reviewed-by Derek Buitenhuis <derek.buitenhuis(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ddedfd39c0d6b49e… --- libavcodec/libx265.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 5a26ca9..19217b0 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -272,6 +272,19 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, pkt->pts = x265pic_out.pts; pkt->dts = x265pic_out.dts; + switch (x265pic_out.sliceType) { + case X265_TYPE_IDR: + case X265_TYPE_I: + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; + break; + case X265_TYPE_P: + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_P; + break; + case X265_TYPE_B: + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_B; + break; + } + *got_packet = 1; return 0; }

1 0

png: Clear up the calculation of max packet size
by git＠videolan.org 31 Mar '15

31 Mar '15

ffmpeg | branch: master | Donny Yang <work(a)kota.moe> | Tue Mar 31 12:37:22 2015 +0000| [749fbfd0817528aa4f43339ce1a3d92f0a258a45] | committer: Michael Niedermayer png: Clear up the calculation of max packet size Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=749fbfd0817528aa4… --- libavcodec/pngenc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 8fff0f3..c913cce 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -307,12 +307,16 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, row_size = (avctx->width * s->bits_per_pixel + 7) >> 3; enc_row_size = deflateBound(&s->zstream, row_size); - max_packet_size = avctx->height * (int64_t)(enc_row_size + - ((enc_row_size + IOBUF_SIZE - 1) / IOBUF_SIZE) * 12) - + FF_MIN_BUFFER_SIZE; + max_packet_size = + FF_MIN_BUFFER_SIZE + // headers + avctx->height * ( + enc_row_size + + 12 * (((int64_t)enc_row_size + IOBUF_SIZE - 1) / IOBUF_SIZE) // IDAT * ceil(enc_row_size / IOBUF_SIZE) + ); if (max_packet_size > INT_MAX) return AVERROR(ENOMEM); - if ((ret = ff_alloc_packet2(avctx, pkt, max_packet_size)) < 0) + ret = ff_alloc_packet2(avctx, pkt, max_packet_size); + if (ret < 0) return ret; s->bytestream_start =

1 0

avcodec/internal: Fix doxy for ff_alloc_packet2() return value
by git＠videolan.org 31 Mar '15

31 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Mar 31 16:14:22 2015 +0200| [65a646eb0b9ae8667c5ca992536aeda525cb89c3] | committer: Michael Niedermayer avcodec/internal: Fix doxy for ff_alloc_packet2() return value Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=65a646eb0b9ae8667… --- libavcodec/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 3bf35df..8128f0d 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -195,7 +195,7 @@ int avpriv_unlock_avformat(void); * avpkt->size is set to the specified size. * All other AVPacket fields will be reset with av_init_packet(). * @param size the minimum required packet size - * @return 0 on success, negative error code on failure + * @return non negative on success, negative error code on failure */ int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size);

1 0

vf_drawtext: add support for setting box border width
by git＠videolan.org 31 Mar '15

31 Mar '15

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Tue Mar 31 00:52:47 2015 +0200| [c84b75c89c019fdf7d1b6e4094beb0d9c316731f] | committer: Michael Niedermayer vf_drawtext: add support for setting box border width Signed-off-by: Marton Balint <cus(a)passwd.hu> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c84b75c89c019fdf7… --- doc/filters.texi | 4 ++++ libavfilter/vf_drawtext.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 15f8ed5..b75ce5a 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3955,6 +3955,10 @@ Used to draw a box around text using the background color. The value must be either 1 (enable) or 0 (disable). The default value of @var{box} is 0. +@item boxborderw +Set the width of the border to be drawn around the box using @var{boxcolor}. +The default value of @var{boxborderw} is 0. + @item boxcolor The color to be used for drawing box around text. For the syntax of this option, check the "Color" section in the ffmpeg-utils manual. diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index cf24d96..a955d09 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -159,6 +159,7 @@ typedef struct DrawTextContext { unsigned int fontsize; ///< font size to use short int draw_box; ///< draw box around text - true or false + int boxborderw; ///< box border width int use_kerning; ///< font kerning is used - true/false int tabsize; ///< tab size int fix_bounds; ///< do we let it go out of frame bounds - t/f @@ -204,6 +205,7 @@ static const AVOption drawtext_options[]= { {"bordercolor", "set border color", OFFSET(bordercolor.rgba), AV_OPT_TYPE_COLOR, {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS}, {"shadowcolor", "set shadow color", OFFSET(shadowcolor.rgba), AV_OPT_TYPE_COLOR, {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS}, {"box", "set box", OFFSET(draw_box), AV_OPT_TYPE_INT, {.i64=0}, 0, 1 , FLAGS}, + {"boxborderw", "set box border width", OFFSET(boxborderw), AV_OPT_TYPE_INT, {.i64=0}, INT_MIN, INT_MAX , FLAGS}, {"fontsize", "set font size", OFFSET(fontsize), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX , FLAGS}, {"x", "set x expression", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str="0"}, CHAR_MIN, CHAR_MAX, FLAGS}, {"y", "set y expression", OFFSET(y_expr), AV_OPT_TYPE_STRING, {.str="0"}, CHAR_MIN, CHAR_MAX, FLAGS}, @@ -1245,7 +1247,8 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame, if (s->draw_box) ff_blend_rectangle(&s->dc, &s->boxcolor, frame->data, frame->linesize, width, height, - s->x, s->y, box_w, box_h); + s->x - s->boxborderw, s->y - s->boxborderw, + box_w + s->boxborderw * 2, box_h + s->boxborderw * 2); if (s->shadowx || s->shadowy) { if ((ret = draw_glyphs(s, frame, width, height,

1 0

avformat/http: Fix null check on allocated value
by git＠videolan.org 31 Mar '15

31 Mar '15

ffmpeg | branch: master | Himangi Saraogi <himangi774(a)gmail.com> | Tue Mar 31 13:11:25 2015 +0530| [919d13d2383bd7318b80ed0c5b723323a79a8996] | committer: Michael Niedermayer avformat/http: Fix null check on allocated value probably fixes CID 1292299 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=919d13d2383bd7318… --- libavformat/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/http.c b/libavformat/http.c index da3c9be..45533e4 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -495,7 +495,7 @@ static int cookie_string(AVDictionary *dict, char **cookies) e = NULL; if (*cookies) av_free(*cookies); *cookies = av_malloc(len); - if (!cookies) return AVERROR(ENOMEM); + if (!*cookies) return AVERROR(ENOMEM); *cookies[0] = '\0'; // write out the cookies

1 0

h264: avoid unnecessary calls to get_format
by git＠videolan.org 31 Mar '15

31 Mar '15

ffmpeg | branch: master | Rainer Hochecker <fernetmenta(a)online.de> | Tue Mar 31 08:27:01 2015 +0200| [8b152c355f6c52ddf5b5b1c6a90bcfb8468fe8d3] | committer: Michael Niedermayer h264: avoid unnecessary calls to get_format Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b152c355f6c52ddf… --- libavcodec/h264_slice.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index dfb44ac..c10568a 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1325,7 +1325,8 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) || h->mb_width != h->sps.mb_width || h->mb_height != h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag) )); - if (non_j_pixfmt(h->avctx->pix_fmt) != non_j_pixfmt(get_pixel_format(h, 0))) + if (h->avctx->pix_fmt == AV_PIX_FMT_NONE + || (non_j_pixfmt(h->avctx->pix_fmt) != non_j_pixfmt(get_pixel_format(h, 0)))) must_reinit = 1; if (first_slice && av_cmp_q(h->sps.sar, h->avctx->sample_aspect_ratio))

1 0

avfilter/vf_detelecine: Fix uninitialized array index error
by git＠videolan.org 31 Mar '15

31 Mar '15

ffmpeg | branch: master | Himangi Saraogi <himangi774(a)gmail.com> | Tue Mar 31 13:01:46 2015 +0530| [0c9abf211931b1a5e3b5d1ebfac3d2214103ae2f] | committer: Michael Niedermayer avfilter/vf_detelecine: Fix uninitialized array index error Fixes the defect CID 1292301 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c9abf211931b1a5e… --- libavfilter/vf_detelecine.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_detelecine.c b/libavfilter/vf_detelecine.c index 218a8c8..8ad7ae3 100644 --- a/libavfilter/vf_detelecine.c +++ b/libavfilter/vf_detelecine.c @@ -265,12 +265,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) out = 1; } else if (len == 1) { // fill in the EARLIER field from the new pic - av_image_copy_plane(s->frame->data[i] + s->frame->linesize[i] * s->first_field, - s->frame->linesize[i] * 2, - inpicref->data[i] + inpicref->linesize[i] * s->first_field, - inpicref->linesize[i] * 2, - s->stride[i], - (s->planeheight[i] - s->first_field + 1) / 2); + for (i = 0; i < s->nb_planes; i++) { + av_image_copy_plane(s->frame->data[i] + + s->frame->linesize[i] * s->first_field, + s->frame->linesize[i] * 2, + inpicref->data[i] + + inpicref->linesize[i] * s->first_field, + inpicref->linesize[i] * 2, s->stride[i], + (s->planeheight[i] - s->first_field + 1) / 2); + } + // TODO: not sure about the other field len--;

1 0