December 2012 - ffmpeg-cvslog

lavf/srtdec: remove line break hack.
by git＠videolan.org 23 Jan '13

23 Jan '13

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Sat Dec 29 23:50:56 2012 +0100| [3af3a3006f39ffe43a954ecb3811ac2c1d9c2d0f] | committer: Clément Bœsch lavf/srtdec: remove line break hack. This is not necessary anymore since the last commit. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3af3a3006f39ffe43… --- libavformat/srtdec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c index cabbb62..1cc8b15 100644 --- a/libavformat/srtdec.c +++ b/libavformat/srtdec.c @@ -115,12 +115,6 @@ static void read_chunk(AVIOContext *pb, AVBPrint *buf) av_bprint_chars(buf, c, 1); n++; } - - /* FIXME: remove the following when the lavc SubRip decoder is fixed - * (trailing tags are not correctly flushed, see what happens to FATE when - * you disable this code) */ - if (buf->len) - av_bprintf(buf, "\n"); } static int srt_read_header(AVFormatContext *s)

2 1

lavfi/overlay: switch to filter_frame API
by git＠videolan.org 10 Jan '13

10 Jan '13

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Sat Dec 8 15:15:20 2012 +0100| [5e402a53191c8afad528ccd7d66f3c37b0cdb0af] | committer: Stefano Sabatini lavfi/overlay: switch to filter_frame API > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5e402a53191c8afad… --- libavfilter/vf_overlay.c | 138 +++++++++++----------------------------------- 1 file changed, 32 insertions(+), 106 deletions(-) diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index d7579aa..4041901 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -294,26 +294,24 @@ static int config_output(AVFilterLink *outlink) // ((((x) + (y)) << 8) - ((x) + (y)) - (y) * (x)) is a faster version of: 255 * (x + y) #define UNPREMULTIPLY_ALPHA(x, y) ((((x) << 16) - ((x) << 9) + (x)) / ((((x) + (y)) << 8) - ((x) + (y)) - (y) * (x))) -static void blend_slice(AVFilterContext *ctx, +/** + * Blend image in src to destination buffer dst at position (x, y). + * + * It is assumed that the src image at position (x, y) is contained in + * dst. + */ +static void blend_image(AVFilterContext *ctx, AVFilterBufferRef *dst, AVFilterBufferRef *src, - int x, int y, int w, int h, - int slice_y, int slice_w, int slice_h) + int x, int y) { OverlayContext *over = ctx->priv; int i, j, k; - int width, height; - int overlay_end_y = y+h; - int slice_end_y = slice_y+slice_h; - int end_y, start_y; - - width = FFMIN(slice_w - x, w); - end_y = FFMIN(slice_end_y, overlay_end_y); - start_y = FFMAX(y, slice_y); - height = end_y - start_y; + int width = src->video->w; + int height = src->video->h; if (over->main_is_packed_rgb) { uint8_t *dp = dst->data[0] + x * over->main_pix_step[0] + - start_y * dst->linesize[0]; + y * dst->linesize[0]; uint8_t *sp = src->data[0]; uint8_t alpha; ///< the amount of overlay to blend on to main const int dr = over->main_rgba_map[R]; @@ -327,8 +325,6 @@ static void blend_slice(AVFilterContext *ctx, const int sa = over->overlay_rgba_map[A]; const int sstep = over->overlay_pix_step[0]; const int main_has_alpha = over->main_has_alpha; - if (slice_y > y) - sp += (slice_y - y) * src->linesize[0]; for (i = 0; i < height; i++) { uint8_t *d = dp, *s = sp; for (j = 0; j < width; j++) { @@ -378,11 +374,9 @@ static void blend_slice(AVFilterContext *ctx, const int main_has_alpha = over->main_has_alpha; if (main_has_alpha) { uint8_t *da = dst->data[3] + x * over->main_pix_step[3] + - start_y * dst->linesize[3]; + y * dst->linesize[3]; uint8_t *sa = src->data[3]; uint8_t alpha; ///< the amount of overlay to blend on to main - if (slice_y > y) - sa += (slice_y - y) * src->linesize[3]; for (i = 0; i < height; i++) { uint8_t *d = da, *s = sa; for (j = 0; j < width; j++) { @@ -412,15 +406,11 @@ static void blend_slice(AVFilterContext *ctx, int hsub = i ? over->hsub : 0; int vsub = i ? over->vsub : 0; uint8_t *dp = dst->data[i] + (x >> hsub) + - (start_y >> vsub) * dst->linesize[i]; + (y >> vsub) * dst->linesize[i]; uint8_t *sp = src->data[i]; uint8_t *ap = src->data[3]; int wp = FFALIGN(width, 1<<hsub) >> hsub; int hp = FFALIGN(height, 1<<vsub) >> vsub; - if (slice_y > y) { - sp += ((slice_y - y) >> vsub) * src->linesize[i]; - ap += (slice_y - y) * src->linesize[3]; - } for (j = 0; j < hp; j++) { uint8_t *d = dp, *s = sp, *a = ap; for (k = 0; k < wp; k++) { @@ -468,11 +458,11 @@ static void blend_slice(AVFilterContext *ctx, } } -static int try_start_frame(AVFilterContext *ctx, AVFilterBufferRef *mainpic) +static int try_filter_frame(AVFilterContext *ctx, AVFilterBufferRef *mainpic) { OverlayContext *over = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; - AVFilterBufferRef *next_overpic, *outpicref; + AVFilterBufferRef *next_overpic; int ret; /* Discard obsolete overlay frames: if there is a next overlay frame with pts @@ -496,21 +486,21 @@ static int try_start_frame(AVFilterContext *ctx, AVFilterBufferRef *mainpic) /* At this point, we know that the current overlay frame extends to the * time of the main frame. */ - outlink->out_buf = outpicref = avfilter_ref_buffer(mainpic, ~0); - av_dlog(ctx, "main_pts:%s main_pts_time:%s", - av_ts2str(outpicref->pts), av_ts2timestr(outpicref->pts, &outlink->time_base)); + av_ts2str(mainpic->pts), av_ts2timestr(mainpic->pts, &outlink->time_base)); if (over->overpicref) av_dlog(ctx, " over_pts:%s over_pts_time:%s", av_ts2str(over->overpicref->pts), av_ts2timestr(over->overpicref->pts, &outlink->time_base)); av_dlog(ctx, "\n"); - ret = ff_start_frame(ctx->outputs[0], avfilter_ref_buffer(outpicref, ~0)); + if (over->overpicref) + blend_image(ctx, mainpic, over->overpicref, over->x, over->y); + ret = ff_filter_frame(ctx->outputs[0], mainpic); over->frame_requested = 0; return ret; } -static int try_start_next_frame(AVFilterContext *ctx) +static int try_filter_next_frame(AVFilterContext *ctx) { OverlayContext *over = ctx->priv; AVFilterBufferRef *next_mainpic = ff_bufqueue_peek(&over->queue_main, 0); @@ -518,41 +508,21 @@ static int try_start_next_frame(AVFilterContext *ctx) if (!next_mainpic) return AVERROR(EAGAIN); - if ((ret = try_start_frame(ctx, next_mainpic)) == AVERROR(EAGAIN)) + if ((ret = try_filter_frame(ctx, next_mainpic)) == AVERROR(EAGAIN)) return ret; - avfilter_unref_buffer(ff_bufqueue_get(&over->queue_main)); + ff_bufqueue_get(&over->queue_main); return ret; } -static int try_push_frame(AVFilterContext *ctx) -{ - OverlayContext *over = ctx->priv; - AVFilterLink *outlink = ctx->outputs[0]; - AVFilterBufferRef *outpicref; - int ret; - - if ((ret = try_start_next_frame(ctx)) < 0) - return ret; - outpicref = outlink->out_buf; - if (over->overpicref) - blend_slice(ctx, outpicref, over->overpicref, over->x, over->y, - over->overpicref->video->w, over->overpicref->video->h, - 0, outpicref->video->w, outpicref->video->h); - if ((ret = ff_draw_slice(outlink, 0, outpicref->video->h, +1)) < 0 || - (ret = ff_end_frame(outlink)) < 0) - return ret; - return 0; -} - static int flush_frames(AVFilterContext *ctx) { int ret; - while (!(ret = try_push_frame(ctx))); + while (!(ret = try_filter_next_frame(ctx))); return ret == AVERROR(EAGAIN) ? 0 : ret; } -static int start_frame_main(AVFilterLink *inlink, AVFilterBufferRef *inpicref) +static int filter_frame_main(AVFilterLink *inlink, AVFilterBufferRef *inpicref) { AVFilterContext *ctx = inlink->dst; OverlayContext *over = ctx->priv; @@ -560,64 +530,29 @@ static int start_frame_main(AVFilterLink *inlink, AVFilterBufferRef *inpicref) if ((ret = flush_frames(ctx)) < 0) return ret; - if ((ret = try_start_frame(ctx, inpicref)) < 0) { + if ((ret = try_filter_frame(ctx, inpicref)) < 0) { if (ret != AVERROR(EAGAIN)) return ret; ff_bufqueue_add(ctx, &over->queue_main, inpicref); - av_assert1(inpicref == inlink->cur_buf); - inlink->cur_buf = NULL; } - return 0; -} -static int draw_slice_main(AVFilterLink *inlink, int y, int h, int slice_dir) -{ - AVFilterContext *ctx = inlink->dst; - OverlayContext *over = ctx->priv; - AVFilterLink *outlink = ctx->outputs[0]; - AVFilterBufferRef *outpicref = outlink->out_buf; - - if (!outpicref) + if (!over->overpicref) return 0; - if (over->overpicref && - y + h > over->y && y < over->y + over->overpicref->video->h) { - blend_slice(ctx, outpicref, over->overpicref, over->x, over->y, - over->overpicref->video->w, over->overpicref->video->h, - y, outpicref->video->w, h); - } - return ff_draw_slice(outlink, y, h, slice_dir); -} - -static int end_frame_main(AVFilterLink *inlink) -{ - AVFilterContext *ctx = inlink->dst; - AVFilterLink *outlink = ctx->outputs[0]; - AVFilterBufferRef *outpicref = outlink->out_buf; flush_frames(ctx); - if (!outpicref) - return 0; - return ff_end_frame(ctx->outputs[0]); -} - -static int start_frame_over(AVFilterLink *inlink, AVFilterBufferRef *inpicref) -{ return 0; } -static int end_frame_over(AVFilterLink *inlink) +static int filter_frame_over(AVFilterLink *inlink, AVFilterBufferRef *inpicref) { AVFilterContext *ctx = inlink->dst; OverlayContext *over = ctx->priv; - AVFilterBufferRef *inpicref = inlink->cur_buf; int ret; - inlink->cur_buf = NULL; - if ((ret = flush_frames(ctx)) < 0) return ret; ff_bufqueue_add(ctx, &over->queue_over, inpicref); - ret = try_push_frame(ctx); + ret = try_filter_next_frame(ctx); return ret == AVERROR(EAGAIN) ? 0 : ret; } @@ -627,7 +562,7 @@ static int request_frame(AVFilterLink *outlink) OverlayContext *over = ctx->priv; int input, ret; - if (!try_push_frame(ctx)) + if (!try_filter_next_frame(ctx)) return 0; over->frame_requested = 1; while (over->frame_requested) { @@ -639,7 +574,7 @@ static int request_frame(AVFilterLink *outlink) /* EOF on main is reported immediately */ if (ret == AVERROR_EOF && input == OVERLAY) { over->overlay_eof = 1; - if ((ret = try_start_next_frame(ctx)) != AVERROR(EAGAIN)) + if ((ret = try_filter_next_frame(ctx)) != AVERROR(EAGAIN)) return ret; ret = 0; /* continue requesting frames on main */ } @@ -649,29 +584,20 @@ static int request_frame(AVFilterLink *outlink) return 0; } -static int null_draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) -{ - return 0; -} - static const AVFilterPad avfilter_vf_overlay_inputs[] = { { .name = "main", .type = AVMEDIA_TYPE_VIDEO, .get_video_buffer = ff_null_get_video_buffer, .config_props = config_input_main, - .start_frame = start_frame_main, - .draw_slice = draw_slice_main, - .end_frame = end_frame_main, + .filter_frame = filter_frame_main, .min_perms = AV_PERM_READ | AV_PERM_WRITE | AV_PERM_PRESERVE, }, { .name = "overlay", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input_overlay, - .start_frame = start_frame_over, - .draw_slice = null_draw_slice, - .end_frame = end_frame_over, + .filter_frame = filter_frame_over, .min_perms = AV_PERM_READ | AV_PERM_PRESERVE, }, { NULL }

3 3

lavc/ass_split: check for NULL pointer in ff_ass_split_override_codes().
by git＠videolan.org 01 Jan '13

01 Jan '13

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Sun Dec 30 06:53:48 2012 +0100| [c83002a4f8042ccfa0688a9a18e8fa0369c1fda8] | committer: Clément Bœsch lavc/ass_split: check for NULL pointer in ff_ass_split_override_codes(). This is consistent with the other ff_ass_split_* functions. It also fixes a crash when trying to split a dialog with text=NULL (which seems to happen when the text of the dialog is empty); basically, this commit fixes crashes when trying to encode an empty text subtitle dialog (see subrip and mov_text encoders). Fixes Ticket2048. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c83002a4f8042ccfa… --- libavcodec/ass_split.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index 4ef3092..ddf4675 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -369,7 +369,7 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks *callbacks, void *priv, char new_line[2]; int text_len = 0; - while (*buf) { + while (buf && *buf) { if (text && callbacks->text && (sscanf(buf, "\\%1[nN]", new_line) == 1 || !strncmp(buf, "{\\", 2))) {

3 3

mov: fix handling of odd sized yv12
by git＠videolan.org 31 Dec '12

31 Dec '12

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Tue Jan 1 00:38:01 2013 +0100| [67abe21c0bdc6fa234ce359f398c77506602f986] | committer: Michael Niedermayer mov: fix handling of odd sized yv12 Part 1 of 2 to fix Ticket339 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67abe21c0bdc6fa23… --- libavformat/mov.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index a7f6494..ee862e5 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1298,8 +1298,11 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) if (len < 31) avio_skip(pb, 31 - len); /* codec_tag YV12 triggers an UV swap in rawdec.c */ - if (!memcmp(st->codec->codec_name, "Planar Y'CbCr 8-bit 4:2:0", 25)) + if (!memcmp(st->codec->codec_name, "Planar Y'CbCr 8-bit 4:2:0", 25)){ st->codec->codec_tag=MKTAG('I', '4', '2', '0'); + st->codec->width &= ~1; + st->codec->height &= ~1; + } /* Flash Media Server uses tag H263 with Sorenson Spark */ if (format == MKTAG('H','2','6','3') && !memcmp(st->codec->codec_name, "Sorenson H263", 13))

1 0

rawdec: fix decoding of odd dimensioned raw yv12
by git＠videolan.org 31 Dec '12

31 Dec '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jan 1 00:35:02 2013 +0100| [f105fe5c22c5b7f426f65d82bee0de47c14bad65] | committer: Michael Niedermayer rawdec: fix decoding of odd dimensioned raw yv12 Fix Ticket339 part 2 of 2 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f105fe5c22c5b7f42… --- libavcodec/rawdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 5002ccc..af42114 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -246,6 +246,11 @@ static int raw_decode(AVCodecContext *avctx, || avctx->codec_tag == MKTAG('Y', 'V', 'U', '9')) FFSWAP(uint8_t *, picture->data[1], picture->data[2]); + if (avctx->codec_tag == AV_RL32("I420") && (avctx->width+1)*(avctx->height+1) * 3/2 == buf_size) { + picture->data[1] = picture->data[1] + (avctx->width+1)*(avctx->height+1) -avctx->width*avctx->height; + picture->data[2] = picture->data[2] + ((avctx->width+1)*(avctx->height+1) -avctx->width*avctx->height)*5/4; + } + if(avctx->codec_tag == AV_RL32("yuv2") && avctx->pix_fmt == AV_PIX_FMT_YUYV422) { int x, y;

1 0

mpeg12: fix frame_pred_frame_dct handling in field pictures
by git＠videolan.org 31 Dec '12

31 Dec '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Dec 31 20:52:52 2012 +0100| [6e8df250fd98e6eae9c47d2c4eca7299a888a70c] | committer: Michael Niedermayer mpeg12: fix frame_pred_frame_dct handling in field pictures Fixes Ticket254 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e8df250fd98e6eae… --- libavcodec/mpeg12.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 1410de5..5ca9bb8 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -878,7 +878,8 @@ static int mpeg_decode_mb(MpegEncContext *s, DCTELEM block[12][64]) s->mv_dir = MV_DIR_FORWARD; if (s->picture_structure == PICT_FRAME) { - if (!s->frame_pred_frame_dct) + if (s->picture_structure == PICT_FRAME + && !s->frame_pred_frame_dct) s->interlaced_dct = get_bits1(&s->gb); s->mv_type = MV_TYPE_16X16; } else { @@ -900,7 +901,7 @@ static int mpeg_decode_mb(MpegEncContext *s, DCTELEM block[12][64]) av_assert2(mb_type & MB_TYPE_L0L1); // FIXME decide if MBs in field pictures are MB_TYPE_INTERLACED /* get additional motion vector type */ - if (s->frame_pred_frame_dct) + if (s->picture_structure == PICT_FRAME && s->frame_pred_frame_dct) motion_type = MT_FRAME; else { motion_type = get_bits(&s->gb, 2);

1 0

mpeg12: print invalid cbp value
by git＠videolan.org 31 Dec '12

31 Dec '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Dec 31 20:33:22 2012 +0100| [49ec0d8ed2462f0d4e8294b9eeb3a735c83f0319] | committer: Michael Niedermayer mpeg12: print invalid cbp value Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49ec0d8ed2462f0d4… --- libavcodec/mpeg12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 16f9a3d..1410de5 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1061,7 +1061,7 @@ static int mpeg_decode_mb(MpegEncContext *s, DCTELEM block[12][64]) s->dsp.clear_blocks(s->block[6]); } if (cbp <= 0) { - av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y); + av_log(s->avctx, AV_LOG_ERROR, "invalid cbp %d at %d %d\n", cbp, s->mb_x, s->mb_y); return -1; }

1 0

mpeg12: print error for invalid skip cases
by git＠videolan.org 31 Dec '12

31 Dec '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Dec 31 20:32:37 2012 +0100| [343900a14777315fe31002334141a9d9616c6022] | committer: Michael Niedermayer mpeg12: print error for invalid skip cases Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=343900a14777315fe… --- libavcodec/mpeg12.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 8f028f3..16f9a3d 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -770,8 +770,10 @@ static int mpeg_decode_mb(MpegEncContext *s, DCTELEM block[12][64]) mb_type = s->current_picture.f.mb_type[s->mb_x + s->mb_y * s->mb_stride - 1]; else mb_type = s->current_picture.f.mb_type[s->mb_width + (s->mb_y - 1) * s->mb_stride - 1]; // FIXME not sure if this is allowed in MPEG at all - if (IS_INTRA(mb_type)) + if (IS_INTRA(mb_type)) { + av_log(s->avctx, AV_LOG_ERROR, "skip with previntra\n"); return -1; + } s->current_picture.f.mb_type[s->mb_x + s->mb_y*s->mb_stride] = mb_type | MB_TYPE_SKIP; // av_assert2(s->current_picture.f.mb_type[s->mb_x + s->mb_y * s->mb_stride - 1] & (MB_TYPE_16x16 | MB_TYPE_16x8));

1 0

lavc/flacenc: improve error return.
by git＠videolan.org 31 Dec '12

31 Dec '12

ffmpeg | branch: master | Nicolas George <nicolas.george(a)normalesup.org> | Mon Dec 31 12:13:36 2012 +0100| [9e28e0035a1554a8048686fba67130b83e1cc13b] | committer: Nicolas George lavc/flacenc: improve error return. Use meaningful error codes and add log messages. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e28e0035a1554a80… --- libavcodec/flacenc.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index dd2c8a7..b6364e1 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -248,8 +248,11 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) break; } - if (channels < 1 || channels > FLAC_MAX_CHANNELS) - return -1; + if (channels < 1 || channels > FLAC_MAX_CHANNELS) { + av_log(avctx, AV_LOG_ERROR, "%d channels not supported (max %d)\n", + channels, FLAC_MAX_CHANNELS); + return AVERROR(EINVAL); + } s->channels = channels; /* find samplerate in table */ @@ -275,7 +278,8 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) s->sr_code[0] = 13; s->sr_code[1] = freq; } else { - return -1; + av_log(avctx, AV_LOG_ERROR, "%d Hz not supported\n", freq); + return AVERROR(EINVAL); } s->samplerate = freq; } @@ -290,7 +294,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) if (level > 12) { av_log(avctx, AV_LOG_ERROR, "invalid compression level: %d\n", s->options.compression_level); - return -1; + return AVERROR(EINVAL); } s->options.block_time_ms = ((int[]){ 27, 27, 27,105,105,105,105,105,105,105,105,105,105})[level]; @@ -329,13 +333,13 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) if (avctx->min_prediction_order > MAX_FIXED_ORDER) { av_log(avctx, AV_LOG_ERROR, "invalid min prediction order: %d\n", avctx->min_prediction_order); - return -1; + return AVERROR(EINVAL); } } else if (avctx->min_prediction_order < MIN_LPC_ORDER || avctx->min_prediction_order > MAX_LPC_ORDER) { av_log(avctx, AV_LOG_ERROR, "invalid min prediction order: %d\n", avctx->min_prediction_order); - return -1; + return AVERROR(EINVAL); } s->options.min_prediction_order = avctx->min_prediction_order; } @@ -346,20 +350,20 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) if (avctx->max_prediction_order > MAX_FIXED_ORDER) { av_log(avctx, AV_LOG_ERROR, "invalid max prediction order: %d\n", avctx->max_prediction_order); - return -1; + return AVERROR(EINVAL); } } else if (avctx->max_prediction_order < MIN_LPC_ORDER || avctx->max_prediction_order > MAX_LPC_ORDER) { av_log(avctx, AV_LOG_ERROR, "invalid max prediction order: %d\n", avctx->max_prediction_order); - return -1; + return AVERROR(EINVAL); } s->options.max_prediction_order = avctx->max_prediction_order; } if (s->options.max_prediction_order < s->options.min_prediction_order) { av_log(avctx, AV_LOG_ERROR, "invalid prediction orders: min=%d max=%d\n", s->options.min_prediction_order, s->options.max_prediction_order); - return -1; + return AVERROR(EINVAL); } if (avctx->frame_size > 0) { @@ -367,7 +371,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) avctx->frame_size > FLAC_MAX_BLOCKSIZE) { av_log(avctx, AV_LOG_ERROR, "invalid block size: %d\n", avctx->frame_size); - return -1; + return AVERROR(EINVAL); } } else { s->avctx->frame_size = select_blocksize(s->samplerate, s->options.block_time_ms);

1 0

lavfi/avfiltergraph: print query_formats errors.
by git＠videolan.org 31 Dec '12

31 Dec '12

ffmpeg | branch: master | Nicolas George <nicolas.george(a)normalesup.org> | Mon Dec 31 14:40:33 2012 +0100| [11ab2c25b6b21cdec1c1d1affc88f3a045a4e28e] | committer: Nicolas George lavfi/avfiltergraph: print query_formats errors. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11ab2c25b6b21cdec… --- libavfilter/avfiltergraph.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index bd772a8..f144624 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -195,8 +195,11 @@ static int filter_query_formats(AVFilterContext *ctx) ctx->outputs && ctx->outputs[0] ? ctx->outputs[0]->type : AVMEDIA_TYPE_VIDEO; - if ((ret = ctx->filter->query_formats(ctx)) < 0) + if ((ret = ctx->filter->query_formats(ctx)) < 0) { + av_log(ctx, AV_LOG_ERROR, "Query format failed for '%s': %s\n", + ctx->name, av_err2str(ret)); return ret; + } formats = ff_all_formats(type); if (!formats)

1 0