diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:41:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:41:21 +0200 |
| commit | b8e4c11d93326cd86278d012c28e54dca0a06cef (patch) | |
| tree | 96ed0fc1c7d5db348b532dd993710430290585a1 /doc/filters.texi | |
| parent | c8571c61ec4c352e7eac7147b7c1644d2406189e (diff) | |
| parent | 481a3667495425db9fdffb653292b6460fb68208 (diff) | |
| download | ffmpeg-b8e4c11d93326cd86278d012c28e54dca0a06cef.tar.gz | |
Merge commit '481a3667495425db9fdffb653292b6460fb68208'
* commit '481a3667495425db9fdffb653292b6460fb68208':
cmdutils: allow matching by metadata in stream specifiers
Conflicts:
Changelog
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
0 files changed, 0 insertions, 0 deletions