diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-22 22:57:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-22 23:56:21 +0200 |
| commit | 88beb2df982aa4de257f742ff41f777927cc5173 (patch) | |
| tree | 15427851afeaa2fee531f53808237948b81b2e44 /libavfilter/vf_thumbnail.c | |
| parent | 9023de342f88e961a3741753aff68925eebf884e (diff) | |
| parent | df53a4a7c1c496363e3fc165b431940ccd0cb8a0 (diff) | |
| download | ffmpeg-88beb2df982aa4de257f742ff41f777927cc5173.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: fix the asyncts test
build: Drop gcc-specific warning flag from header compilation rule
FATE: add a test for the asyncts audio filter.
matroskadec: return more correct error code on read error.
buffersrc: check ff_get_audio_buffer() for errors.
lavfi: check all ff_get_video_buffer() calls for errors.
lavfi: check all avfilter_ref_buffer() calls for errors.
vf_select: avoid an unnecessary avfilter_ref_buffer().
buffersrc: avoid creating unnecessary buffer reference
lavfi: use avfilter_unref_bufferp() where appropriate.
vf_fps: add more error checks.
vf_fps: fix a memleak on malloc failure.
lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors
lavfi: add error handling to end_frame().
lavfi: add error handling to draw_slice().
lavfi: add error handling to start_frame().
Conflicts:
Makefile
ffplay.c
libavfilter/buffersrc.c
libavfilter/vf_boxblur.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_frei0r.c
libavfilter/vf_hflip.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/video.c
libavfilter/vsrc_color.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_thumbnail.c')
| -rw-r--r-- | libavfilter/vf_thumbnail.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavfilter/vf_thumbnail.c b/libavfilter/vf_thumbnail.c index 4359635c1f..8e73de920f 100644 --- a/libavfilter/vf_thumbnail.c +++ b/libavfilter/vf_thumbnail.c @@ -68,7 +68,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args) return 0; } -static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) +static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) { int i, j; AVFilterContext *ctx = inlink->dst; @@ -86,6 +86,7 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) } p += picref->linesize[0]; } + return 0; } /** @@ -106,7 +107,7 @@ static double frame_sum_square_err(const int *hist, const double *median) return sum_sq_err; } -static void end_frame(AVFilterLink *inlink) +static int end_frame(AVFilterLink *inlink) { int i, j, best_frame_idx = 0; double avg_hist[HIST_SIZE] = {0}, sq_err, min_sq_err = -1; @@ -122,7 +123,7 @@ static void end_frame(AVFilterLink *inlink) // no selection until the buffer of N frames is filled up if (thumb->n < thumb->n_frames - 1) { thumb->n++; - return; + return 0; } // average histogram of the N frames @@ -156,7 +157,7 @@ static void end_frame(AVFilterLink *inlink) ff_start_frame(outlink, picref); thumb->frames[best_frame_idx].buf = NULL; ff_draw_slice(outlink, 0, inlink->h, 1); - ff_end_frame(outlink); + return ff_end_frame(outlink); } static av_cold void uninit(AVFilterContext *ctx) @@ -170,7 +171,7 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&thumb->frames); } -static void null_start_frame(AVFilterLink *link, AVFilterBufferRef *picref) { } +static int null_start_frame(AVFilterLink *link, AVFilterBufferRef *picref) { return 0; } static int request_frame(AVFilterLink *link) { |