diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 10:11:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 10:11:01 +0200 |
| commit | a1b88797144111262b07cde42b038387a3c6578b (patch) | |
| tree | 3f8094e150245f08e0464da9ab582b979b1ba80f /libavfilter/split.c | |
| parent | 52fa2945b594d02c84b817aaa3d01041eb2c1cf7 (diff) | |
| parent | 949c603ed9210df0e1b8e1aa82c71b93543d8071 (diff) | |
| download | ffmpeg-a1b88797144111262b07cde42b038387a3c6578b.tar.gz | |
Merge commit '949c603ed9210df0e1b8e1aa82c71b93543d8071'
* commit '949c603ed9210df0e1b8e1aa82c71b93543d8071':
af_channelmap: remove now unnecessary goto
vf_split: fix description
Conflicts:
libavfilter/split.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/split.c')
| -rw-r--r-- | libavfilter/split.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/split.c b/libavfilter/split.c index 251ea2e4a3..3e6a60f0dc 100644 --- a/libavfilter/split.c +++ b/libavfilter/split.c @@ -115,7 +115,7 @@ static const AVFilterPad avfilter_vf_split_inputs[] = { AVFilter avfilter_vf_split = { .name = "split", - .description = NULL_IF_CONFIG_SMALL("Pass on the input video to N outputs."), + .description = NULL_IF_CONFIG_SMALL("Pass on the input to N video outputs."), .priv_size = sizeof(SplitContext), .priv_class = &split_class, |