diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-20 19:55:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-20 20:15:40 +0100 |
| commit | 50255b7a865f0dd4fecf8d1e337f96b92b4b406e (patch) | |
| tree | 56c4827a3de1357eaca5704a17f1303795198269 /ffmpeg.c | |
| parent | 60b9373dbd52bba91d2286d5f8a1366090a9df08 (diff) | |
| parent | 342fc46c69199b076b7c210f42208ce39a2bde1c (diff) | |
Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'
* commit '342fc46c69199b076b7c210f42208ce39a2bde1c':
cmdutils: Add a stream specifier to map usable streams
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions