diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-22 19:01:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-22 19:07:28 +0200 |
| commit | cf47a6a1a0848567d1453f2830d567f22e551dca (patch) | |
| tree | b67e45211796ec4045fbbba753cb533a45ebc22a /common.mak | |
| parent | c2f3715cb3fce093137591e3005de3e831b1f9fd (diff) | |
| parent | f825d42bccdb9f89669a586951de7f66a81e80a5 (diff) | |
Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5'
* commit 'f825d42bccdb9f89669a586951de7f66a81e80a5':
avplay: Accept cpuflags option
Conflicts:
cmdutils_common_opts.h
doc/ffmpeg.texi
doc/fftools-common-opts.texi
ffmpeg_opt.c
See: 1060e9ce5454e7ac009969ab2cf8f7cd83a69ac3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions