History

Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'

* commit '3b266da3d35f3f7a61258b78384dfe920d875d29': avconv: add support for complex filtergraphs. avconv: make filtergraphs global. avconv: move filtered_frame from InputStream to OutputStream. avconv: don't set output width/height directly from input value. avconv: move resample_{width,height,pix_fmt} to InputStream. avconv: remove a useless variable from OutputStream. avconv: get output pixel format from lavfi. graphparser: fix the order in which unlabeled input links are returned. avconv: change {input,output}_{streams,files} into arrays of pointers. avconv: don't pass input/output streams to some functions. Conflicts: cmdutils.c cmdutils.h doc/ffmpeg.texi ffmpeg.c ffplay.c

Michael Niedermayer committed 14 years ago

Commit 47787832 parents dcd207c 3b266da11 files · +924 −415Browse files

Showing the changes to libavfilter/graphparser.c (1 of 11 files). Show all

Unified · Split

libavfilter/graphparser.c+1−1
@@ -242,7 +242,7 @@ static int link_filter_inouts(AVFilterContext *filt_ctx, · 241 unmodified lines
242 } else {242 } else {
243 p->filter_ctx = filt_ctx;243 p->filter_ctx = filt_ctx;
244 p->pad_idx = pad;244 p->pad_idx = pad;
245 insert_inout(open_inputs, p);245 append_inout(open_inputs, &p);
246 }246 }
247 }247 }
248 248

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t