diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-02 22:07:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-02 22:08:11 +0200 |
| commit | e874772f70908ad5b1754c0373a35bec08fad547 (patch) | |
| tree | c8b46d7ef5123cc18cb2114688246bc35c07dee5 /ffplay.c | |
| parent | 94f4bdc4f146bcfa46be341d5aab3221af4cdd57 (diff) | |
| parent | 21180b73239c6360aa28496d4879713b7ba4a8e5 (diff) | |
| download | ffmpeg-e874772f70908ad5b1754c0373a35bec08fad547.tar.gz | |
Merge commit '21180b73239c6360aa28496d4879713b7ba4a8e5'
* commit '21180b73239c6360aa28496d4879713b7ba4a8e5':
avplay: Factorize code for adding filters to the filter pipeline
Conflicts:
ffplay.c
See: 08c51e12b1c3f3e3e68e33eb46be7131df5b3682
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
| -rw-r--r-- | ffplay.c | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -1995,20 +1995,20 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c /* Note: this macro adds a filter before the lastly added filter, so the * processing order of the filters is in reverse */ -#define INSERT_FILT(name, arg) do { \ - AVFilterContext *filt_ctx; \ - \ - ret = avfilter_graph_create_filter(&filt_ctx, \ - avfilter_get_by_name(name), \ - "ffplay_" name, arg, NULL, graph); \ - if (ret < 0) \ - goto fail; \ - \ - ret = avfilter_link(filt_ctx, 0, last_filter, 0); \ - if (ret < 0) \ - goto fail; \ - \ - last_filter = filt_ctx; \ +#define INSERT_FILT(name, arg) do { \ + AVFilterContext *filt_ctx; \ + \ + ret = avfilter_graph_create_filter(&filt_ctx, \ + avfilter_get_by_name(name), \ + "ffplay_" name, arg, NULL, graph); \ + if (ret < 0) \ + goto fail; \ + \ + ret = avfilter_link(filt_ctx, 0, last_filter, 0); \ + if (ret < 0) \ + goto fail; \ + \ + last_filter = filt_ctx; \ } while (0) /* SDL YUV code is not handling odd width/height for some driver |