February 2012 - ffmpeg-cvslog

lavfi: add a new function av_buffersrc_buffer().
by git＠videolan.org 21 May '12

21 May '12

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Dec 21 20:39:18 2011 +0100| [e1d9dbf2d465448028bf396d7b37dbb642794678] | committer: Anton Khirnov lavfi: add a new function av_buffersrc_buffer(). It can be used to directly pass a AVFilterBufferRef to lavfi, avoiding a memcpy. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1d9dbf2d46544802… --- libavfilter/Makefile | 2 +- libavfilter/buffersrc.h | 38 ++++++++++++++++++++++++++ libavfilter/vsrc_buffer.c | 66 ++++++++++++++++++++++---------------------- 3 files changed, 72 insertions(+), 34 deletions(-) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index c269db5..78c4692 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -3,7 +3,7 @@ FFLIBS = avutil FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec FFLIBS-$(CONFIG_SCALE_FILTER) += swscale -HEADERS = avfilter.h avfiltergraph.h vsrc_buffer.h +HEADERS = avfilter.h avfiltergraph.h buffersrc.h vsrc_buffer.h OBJS = allfilters.o \ avfilter.o \ diff --git a/libavfilter/buffersrc.h b/libavfilter/buffersrc.h new file mode 100644 index 0000000..bd82c06 --- /dev/null +++ b/libavfilter/buffersrc.h @@ -0,0 +1,38 @@ +/* + * + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFILTER_BUFFERSRC_H +#define AVFILTER_BUFFERSRC_H + +/** + * @file + * Memory buffer source API. + */ + +#include "avfilter.h" + +/** + * Add a buffer to the filtergraph s. + * + * @param buf buffer containing frame data to be passed down the filtergraph. + * This function will take ownership of buf, the user must not free it. + */ +int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf); + +#endif /* AVFILTER_BUFFERSRC_H */ diff --git a/libavfilter/vsrc_buffer.c b/libavfilter/vsrc_buffer.c index 982fed5..7ef19a1 100644 --- a/libavfilter/vsrc_buffer.c +++ b/libavfilter/vsrc_buffer.c @@ -24,13 +24,12 @@ */ #include "avfilter.h" +#include "buffersrc.h" #include "vsrc_buffer.h" #include "libavutil/imgutils.h" typedef struct { - int64_t pts; - AVFrame frame; - int has_frame; + AVFilterBufferRef *buf; int h, w; enum PixelFormat pix_fmt; AVRational time_base; ///< time_base to set in the output link @@ -42,7 +41,7 @@ int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, { BufferSourceContext *c = buffer_filter->priv; - if (c->has_frame) { + if (c->buf) { av_log(buffer_filter, AV_LOG_ERROR, "Buffering several frames is not supported. " "Please consume all available frames before adding a new one.\n" @@ -50,15 +49,31 @@ int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, //return -1; } - memcpy(c->frame.data , frame->data , sizeof(frame->data)); - memcpy(c->frame.linesize, frame->linesize, sizeof(frame->linesize)); - c->frame.interlaced_frame= frame->interlaced_frame; - c->frame.top_field_first = frame->top_field_first; - c->frame.key_frame = frame->key_frame; - c->frame.pict_type = frame->pict_type; - c->pts = pts; - c->pixel_aspect = pixel_aspect; - c->has_frame = 1; + c->buf = avfilter_get_video_buffer(buffer_filter->outputs[0], AV_PERM_WRITE, + c->w, c->h); + av_image_copy(c->buf->data, c->buf->linesize, frame->data, frame->linesize, + c->pix_fmt, c->w, c->h); + + avfilter_copy_frame_props(c->buf, frame); + c->buf->pts = pts; + c->buf->video->pixel_aspect = pixel_aspect; + + return 0; +} + +int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf) +{ + BufferSourceContext *c = s->priv; + + if (c->buf) { + av_log(s, AV_LOG_ERROR, + "Buffering several frames is not supported. " + "Please consume all available frames before adding a new one.\n" + ); + return AVERROR(EINVAL); + } + + c->buf = buf; return 0; } @@ -113,33 +128,18 @@ static int config_props(AVFilterLink *link) static int request_frame(AVFilterLink *link) { BufferSourceContext *c = link->src->priv; - AVFilterBufferRef *picref; - if (!c->has_frame) { + if (!c->buf) { av_log(link->src, AV_LOG_ERROR, "request_frame() called with no available frame!\n"); //return -1; } - /* This picture will be needed unmodified later for decoding the next - * frame */ - picref = avfilter_get_video_buffer(link, AV_PERM_WRITE | AV_PERM_PRESERVE | - AV_PERM_REUSE2, - link->w, link->h); - - av_image_copy(picref->data, picref->linesize, - c->frame.data, c->frame.linesize, - picref->format, link->w, link->h); - - avfilter_copy_frame_props(picref, &c->frame); - picref->pts = c->pts; - picref->video->pixel_aspect = c->pixel_aspect; - avfilter_start_frame(link, avfilter_ref_buffer(picref, ~0)); + avfilter_start_frame(link, avfilter_ref_buffer(c->buf, ~0)); avfilter_draw_slice(link, 0, link->h, 1); avfilter_end_frame(link); - avfilter_unref_buffer(picref); - - c->has_frame = 0; + avfilter_unref_buffer(c->buf); + c->buf = NULL; return 0; } @@ -147,7 +147,7 @@ static int request_frame(AVFilterLink *link) static int poll_frame(AVFilterLink *link) { BufferSourceContext *c = link->src->priv; - return !!(c->has_frame); + return !!(c->buf); } AVFilter avfilter_vsrc_buffer = {

3 3

avfiltergraph: change the syntax of avfilter_graph_parse()
by git＠videolan.org 18 May '12

18 May '12

ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala(a)poste.it> | Sat Jun 11 15:16:02 2011 +0200| [6119b23a3662d1e106cdf69ef3171b2e7e1d495c] | committer: Stefano Sabatini avfiltergraph: change the syntax of avfilter_graph_parse() Make it returns the list of open inputs and outputs, so it can be reused by applications. Breaks API/ABI. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6119b23a3662d1e10… --- doc/APIchanges | 3 +++ ffmpeg.c | 2 +- ffplay.c | 2 +- libavfilter/avfilter.h | 4 ++-- libavfilter/avfiltergraph.h | 8 +++++--- libavfilter/graphparser.c | 20 ++++++++++---------- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 592c268..40efee8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2011-04-18 API changes, most recent first: +2011-06-12 - xxxxxxx - lavfi 2.16.0 - avfilter_graph_parse() + Change avfilter_graph_parse() signature. + 2011-06-xx - xxxxxxx - lavu 51.6.0 - opt.h Add av_opt_flag_is_set(). diff --git a/ffmpeg.c b/ffmpeg.c index 35395a9..f69c054 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -418,7 +418,7 @@ static int configure_video_filters(AVInputStream *ist, AVOutputStream *ost) inputs->pad_idx = 0; inputs->next = NULL; - if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, inputs, outputs, NULL)) < 0) + if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, &inputs, &outputs, NULL)) < 0) return ret; av_freep(&ost->avfilter); } else { diff --git a/ffplay.c b/ffplay.c index ebe9e05..c5f5f75 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1708,7 +1708,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c inputs->pad_idx = 0; inputs->next = NULL; - if ((ret = avfilter_graph_parse(graph, vfilters, inputs, outputs, NULL)) < 0) + if ((ret = avfilter_graph_parse(graph, vfilters, &inputs, &outputs, NULL)) < 0) goto the_end; av_freep(&vfilters); } else { diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 64d76cc..fbd1dc4 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -26,8 +26,8 @@ #include "libavutil/samplefmt.h" #define LIBAVFILTER_VERSION_MAJOR 2 -#define LIBAVFILTER_VERSION_MINOR 15 -#define LIBAVFILTER_VERSION_MICRO 1 +#define LIBAVFILTER_VERSION_MINOR 16 +#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index 23a7c51..538fd2c 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -112,12 +112,14 @@ typedef struct AVFilterInOut { * * @param graph the filter graph where to link the parsed graph context * @param filters string to be parsed - * @param inputs linked list to the inputs of the graph - * @param outputs linked list to the outputs of the graph + * @param inputs linked list to the inputs of the graph, may be NULL. + * It is updated to contain the list of open inputs after the parsing. + * @param outputs linked list to the outputs of the graph, may be NULL. + * It is updated to contain the list of open outputs after the parsing. * @return zero on success, a negative AVERROR code on error */ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, - AVFilterInOut *inputs, AVFilterInOut *outputs, + AVFilterInOut **inputs, AVFilterInOut **outputs, void *log_ctx); #endif /* AVFILTER_AVFILTERGRAPH_H */ diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index aa1f228..ea0c5dd 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -328,8 +328,8 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs, } int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, - AVFilterInOut *open_inputs, - AVFilterInOut *open_outputs, void *log_ctx) + AVFilterInOut **open_inputs, AVFilterInOut **open_outputs, + void *log_ctx) { int index = 0, ret; char chr = 0; @@ -341,7 +341,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, const char *filterchain = filters; filters += strspn(filters, WHITESPACES); - if ((ret = parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx)) < 0) + if ((ret = parse_inputs(&filters, &curr_inputs, open_outputs, log_ctx)) < 0) goto fail; if ((ret = parse_filter(&filter, &filters, graph, index, log_ctx)) < 0) @@ -350,14 +350,14 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, if (filter->input_count == 1 && !curr_inputs && !index) { /* First input can be omitted if it is "[in]" */ const char *tmp = "[in]"; - if ((ret = parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx)) < 0) + if ((ret = parse_inputs(&tmp, &curr_inputs, open_outputs, log_ctx)) < 0) goto fail; } - if ((ret = link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx)) < 0) + if ((ret = link_filter_inouts(filter, &curr_inputs, open_inputs, log_ctx)) < 0) goto fail; - if ((ret = parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs, + if ((ret = parse_outputs(&filters, &curr_inputs, open_inputs, open_outputs, log_ctx)) < 0) goto fail; @@ -382,10 +382,10 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, goto fail; } - if (open_inputs && !strcmp(open_inputs->name, "out") && curr_inputs) { + if (*open_inputs && !strcmp((*open_inputs)->name, "out") && curr_inputs) { /* Last output can be omitted if it is "[out]" */ const char *tmp = "[out]"; - if ((ret = parse_outputs(&tmp, &curr_inputs, &open_inputs, &open_outputs, + if ((ret = parse_outputs(&tmp, &curr_inputs, open_inputs, open_outputs, log_ctx)) < 0) goto fail; } @@ -396,8 +396,8 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, for (; graph->filter_count > 0; graph->filter_count--) avfilter_free(graph->filters[graph->filter_count - 1]); av_freep(&graph->filters); - free_inout(open_inputs); - free_inout(open_outputs); + free_inout(*open_inputs); + free_inout(*open_outputs); free_inout(curr_inputs); return ret; }

2 1

lavc: fix 10l oversight in realloc of avcodec_encode_video2.
by git＠videolan.org 29 Feb '12

29 Feb '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Feb 29 21:33:00 2012 +0100| [a77c8ade2ee20fc6149e4c689a3f196f53e85273] | committer: Michael Niedermayer lavc: fix 10l oversight in realloc of avcodec_encode_video2. Packets are not guranteed to be allocated by av_malloc(). Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a77c8ade2ee20fc61… --- libavcodec/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 99e36f8..b612ca1 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1219,7 +1219,7 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, avpkt->size = 0; else if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) avpkt->pts = avpkt->dts = frame->pts; - if (avpkt->data) { + if (avpkt->data && avpkt->destruct == av_destruct_packet) { new_data = av_realloc(avpkt->data, avpkt->size + FF_INPUT_BUFFER_PADDING_SIZE); if (new_data)

1 0

dca: dont overread dca_default_coeffs.
by git＠videolan.org 29 Feb '12

29 Feb '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Feb 29 21:14:17 2012 +0100| [d7bce4a274c4fc7453cde2d1c5d8a7a5805718df] | committer: Michael Niedermayer dca: dont overread dca_default_coeffs. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7bce4a274c4fc745… --- libavcodec/dca.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 33e4120..3158263 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -801,10 +801,14 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index) } } else { int am = s->amode & DCA_CHANNEL_MASK; + if (am < 16) { for (j = base_channel; j < s->prim_channels; j++) { s->downmix_coef[j][0] = dca_default_coeffs[am][j][0]; s->downmix_coef[j][1] = dca_default_coeffs[am][j][1]; } + } else { + av_log(s->avctx, AV_LOG_WARNING, "amode > 15 default downmix_coef unsupported\n"); + } } }

1 0

dca: Check scale_sum.
by git＠videolan.org 29 Feb '12

29 Feb '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Feb 29 20:47:47 2012 +0100| [51db9a97e9edde4c80218d194731e187ea7dcba8] | committer: Michael Niedermayer dca: Check scale_sum. Fixes a out of array read. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=51db9a97e9edde4c8… --- libavcodec/dca.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 562eb94..33e4120 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -717,15 +717,19 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index) for (j = base_channel; j < s->prim_channels; j++) { const uint32_t *scale_table; + unsigned int scale_max; int scale_sum; memset(s->scale_factor[j], 0, s->subband_activity[j] * sizeof(s->scale_factor[0][0][0]) * 2); - if (s->scalefactor_huffman[j] == 6) + if (s->scalefactor_huffman[j] == 6) { scale_table = scale_factor_quant7; - else + scale_max = 127; + } else { scale_table = scale_factor_quant6; + scale_max = 63; + } /* When huffman coded, only the difference is encoded */ scale_sum = 0; @@ -733,12 +737,20 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index) for (k = 0; k < s->subband_activity[j]; k++) { if (k >= s->vq_start_subband[j] || s->bitalloc[j][k] > 0) { scale_sum = get_scale(&s->gb, s->scalefactor_huffman[j], scale_sum); + if (scale_sum > scale_max) { + av_log(s->avctx, AV_LOG_ERROR, "scale_sum out of range\n"); + return AVERROR_INVALIDDATA; + } s->scale_factor[j][k][0] = scale_table[scale_sum]; } if (k < s->vq_start_subband[j] && s->transition_mode[j][k]) { /* Get second scale factor */ scale_sum = get_scale(&s->gb, s->scalefactor_huffman[j], scale_sum); + if (scale_sum > scale_max) { + av_log(s->avctx, AV_LOG_ERROR, "scale_sum out of range\n"); + return AVERROR_INVALIDDATA; + } s->scale_factor[j][k][1] = scale_table[scale_sum]; } }

1 0

dca: Check LFEScaleIndex.
by git＠videolan.org 29 Feb '12

29 Feb '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Feb 29 18:09:51 2012 +0100| [d6bc273bac45d6c28e5ec00103268a6fba16f304] | committer: Michael Niedermayer dca: Check LFEScaleIndex. Its not clear from the spec what to do with values larger than 127 so iam opting for the safe side and ask for a sample. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6bc273bac45d6c28… --- libavcodec/dca.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 4ac291f..562eb94 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -817,6 +817,7 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index) /* Low frequency effect data */ if (!base_channel && s->lfe) { + int quant7; /* LFE samples */ int lfe_samples = 2 * s->lfe * (4 + block_index); int lfe_end_sample = 2 * s->lfe * (4 + block_index + s->subsubframes[s->current_subframe]); @@ -828,7 +829,12 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index) } /* Scale factor index */ - s->lfe_scale_factor = scale_factor_quant7[get_bits(&s->gb, 8)]; + quant7 = get_bits(&s->gb, 8); + if (quant7 > 127) { + av_log_ask_for_sample(s->avctx, "LFEScaleIndex larger than 127\n"); + return AVERROR_INVALIDDATA; + } + s->lfe_scale_factor = scale_factor_quant7[quant7]; /* Quantization step size * scale factor */ lfe_scale = 0.035 * s->lfe_scale_factor;

1 0

tests: add libpostproc test
by git＠videolan.org 29 Feb '12

29 Feb '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Feb 28 05:18:08 2012 +0100| [1ebc5e71a0310deae3e6dbf73b7eb7bfeb491998] | committer: Michael Niedermayer tests: add libpostproc test Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ebc5e71a0310deae… --- tests/lavfi-regression.sh | 1 + tests/ref/lavfi/pp | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index faa7bdd..d00dfe6 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -38,6 +38,7 @@ do_lavfi "fade" "fade=in:5:15,fade=out:30:15" do_lavfi "null" "null" do_lavfi "overlay" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo,[o2]overlay=240:16" do_lavfi "pad" "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2" +do_lavfi "pp" "mp=pp=de/tn/l5/al" do_lavfi "scale200" "scale=200:200" do_lavfi "scale500" "scale=500:500" do_lavfi "select" "select=not(eq(mod(n\,2)\,0)+eq(mod(n\,3)\,0))" diff --git a/tests/ref/lavfi/pp b/tests/ref/lavfi/pp new file mode 100644 index 0000000..4d26254 --- /dev/null +++ b/tests/ref/lavfi/pp @@ -0,0 +1 @@ +pp 3ddfb037bb1f941d6526a2473a191677

2 1

encode_video2: shrink packet after encoding.
by git＠videolan.org 29 Feb '12

29 Feb '12

ffmpeg | branch: master | Nicolas George <nicolas.george(a)normalesup.org> | Wed Feb 29 14:39:50 2012 +0100| [33b9fe562a307629d8db61edcf729c4cb8f78413] | committer: Nicolas George encode_video2: shrink packet after encoding. With the encode2 API, encoders allocate huge packets to be sure they have enough room (a typical case is mpeg4, which allocs ~10M for 1280x768 yuv420p) but only actually use a very small part of the buffer. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33b9fe562a307629d… --- libavcodec/utils.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 63f7fae..99e36f8 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1198,6 +1198,7 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, { int ret; int user_packet = !!avpkt->data; + void *new_data; *got_packet_ptr = 0; @@ -1218,6 +1219,12 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, avpkt->size = 0; else if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) avpkt->pts = avpkt->dts = frame->pts; + if (avpkt->data) { + new_data = av_realloc(avpkt->data, + avpkt->size + FF_INPUT_BUFFER_PADDING_SIZE); + if (new_data) + avpkt->data = new_data; + } avctx->frame_number++; }

1 0

fate: disable deshake test as it isnt binary identical across archs.
by git＠videolan.org 29 Feb '12

29 Feb '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Feb 29 06:44:19 2012 +0100| [52ae41a87472c040aa79edf231a9bff2f3376869] | committer: Michael Niedermayer fate: disable deshake test as it isnt binary identical across archs. probably due to float rounding Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52ae41a87472c040a… --- tests/lavfi-regression.sh | 1 - tests/ref/lavfi/deshake | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index 1bb0dfe..79210e5 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -32,7 +32,6 @@ do_lavfi "crop" "crop=iw-100:ih-100:100:100" do_lavfi "crop_scale" "crop=iw-100:ih-100:100:100,scale=400:-1" do_lavfi "crop_scale_vflip" "null,null,crop=iw-200:ih-200:200:200,crop=iw-20:ih-20:20:20,scale=200:200,scale=250:250,vflip,vflip,null,scale=200:200,crop=iw-100:ih-100:100:100,vflip,scale=200:200,null,vflip,crop=iw-100:ih-100:100:100,null" do_lavfi "crop_vflip" "crop=iw-100:ih-100:100:100,vflip" -do_lavfi "deshake" "deshake" do_lavfi "drawbox" "drawbox=224:24:88:72:#FF8010@0.5" do_lavfi "fade" "fade=in:5:15,fade=out:30:15" do_lavfi "null" "null" diff --git a/tests/ref/lavfi/deshake b/tests/ref/lavfi/deshake deleted file mode 100644 index 83fb59c..0000000 --- a/tests/ref/lavfi/deshake +++ /dev/null @@ -1 +0,0 @@ -deshake aa32fdc7f9f890dd62b0ea9c3ca16e60

1 0

vmnc: Fail if bpp is not recognized instead of crashing.
by git＠videolan.org 29 Feb '12

29 Feb '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Feb 29 06:21:44 2012 +0100| [6aca18a9a0b570b61d75ef351d3ca6bb104c04db] | committer: Michael Niedermayer vmnc: Fail if bpp is not recognized instead of crashing. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6aca18a9a0b570b61… --- libavcodec/vmnc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index 21141fa..ac0b825 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -484,6 +484,7 @@ static av_cold int decode_init(AVCodecContext *avctx) break; default: av_log(avctx, AV_LOG_ERROR, "Unsupported bitdepth %i\n", c->bpp); + return AVERROR_PATCHWELCOME; } return 0;

1 0