diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 14:57:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 14:57:40 +0200 |
| commit | 1eda312aca278c81fea9f0f67413b3ee9f386b4a (patch) | |
| tree | 513723b74639e4ae4c3e6c6e7f6bbea6b9212ae7 /presets | |
| parent | 7dba57d1fa6b21e88f9539e1e02a07dd07899cda (diff) | |
| parent | 47e3e1097e09da7f973908e09df15e3bb7c5e1f4 (diff) | |
| download | ffmpeg-1eda312aca278c81fea9f0f67413b3ee9f386b4a.tar.gz | |
Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'
* commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4':
cmdutils: Use the correct guard
Conflicts:
cmdutils.c
See: 35daf3ca8173f80f200860e06a410ced31a8b360
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions