* commit '7e350379f87e7f74420b4813170fe808e2313911': lavfi: switch to AVFrame. Conflicts: doc/filters.texi libavfilter/af_ashowinfo.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersink.c libavfilter/buffersrc.c libavfilter/buffersrc.h libavfilter/f_select.c libavfilter/f_setpts.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/version.h libavfilter/vf_aspect.c libavfilter/vf_bbox.c libavfilter/vf_blackframe.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hqdn3d.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavfilter/yadif.h Following are notes about the merge authorship and various technical details. Michael Niedermayer: * Main merge operation, notably avfilter.c and video.c * Switch to AVFrame: - afade - anullsrc - apad - aresample - blackframe - deshake - idet - il - mandelbrot - mptestsrc - noise - setfield - smartblur - tinterlace * various merge changes and fixes in: - ashowinfo - blackdetect - field - fps - select - testsrc - yadif Nicolas George: * Switch to AVFrame: - make rawdec work with refcounted frames. Adapted from commit 759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov. Also, fix the use of || instead of | in a flags check. - make buffer sink and src, audio and video work all together Clément Bœsch: * Switch to AVFrame: - aevalsrc - alphaextract - blend - cellauto - colormatrix - concat - earwax - ebur128 - edgedetect - geq - histeq - histogram - hue - kerndeint - life - movie - mp (with the help of Michael) - overlay - pad - pan - pp - pp - removelogo - sendcmd - showspectrum - showwaves - silencedetect - stereo3d - subtitles - super2xsai - swapuv - thumbnail - tile Hendrik Leppkes: * Switch to AVFrame: - aconvert - amerge - asetnsamples - atempo - biquads Matthieu Bouron: * Switch to AVFrame - alphamerge - decimate - volumedetect Stefano Sabatini: * Switch to AVFrame: - astreamsync - flite - framestep Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Clément Bœsch <ubitux@gmail.com> Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Showing the changes to libavfilter/split.c (1 of 124 files). Show all
Unified · Split
| @@ -68,17 +68,17 @@ static void split_uninit(AVFilterContext *ctx) · 67 unmodified lines | |||
| 68 | av_freep(&ctx->output_pads[i].name); | 68 | av_freep(&ctx->output_pads[i].name); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame) | 71 | static int filter_frame(AVFilterLink *inlink, AVFrame *frame) |
| 72 | { | 72 | { |
| 73 | AVFilterContext *ctx = inlink->dst; | 73 | AVFilterContext *ctx = inlink->dst; |
| 74 | int i, ret = AVERROR_EOF; | 74 | int i, ret = AVERROR_EOF; |
| 75 | 75 | ||
| 76 | for (i = 0; i < ctx->nb_outputs; i++) { | 76 | for (i = 0; i < ctx->nb_outputs; i++) { |
| 77 | AVFilterBufferRef *buf_out; | 77 | AVFrame *buf_out; |
| 78 | 78 | ||
| 79 | if (ctx->outputs[i]->closed) | 79 | if (ctx->outputs[i]->closed) |
| 80 | continue; | 80 | continue; |
| 81 | buf_out = avfilter_ref_buffer(frame, ~AV_PERM_WRITE); | 81 | buf_out = av_frame_clone(frame); |
| 82 | if (!buf_out) { | 82 | if (!buf_out) { |
| 83 | ret = AVERROR(ENOMEM); | 83 | ret = AVERROR(ENOMEM); |
| 84 | break; | 84 | break; |
| @@ -88,7 +88,7 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame) · 3 unmodified lines | |||
| 88 | if (ret < 0) | 88 | if (ret < 0) |
| 89 | break; | 89 | break; |
| 90 | } | 90 | } |
| 91 | avfilter_unref_bufferp(&frame); | 91 | av_frame_free(&frame); |
| 92 | return ret; | 92 | return ret; |
| 93 | } | 93 | } |
| 94 | 94 | ||