diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-23 23:32:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-23 23:32:36 +0200 |
| commit | 20aac40571a51aa5c32dc15958a73a23158986e2 (patch) | |
| tree | f7841e56381a8089b344439ad057e09b60b49602 /libavformat/act.c | |
| parent | 00dbd7c4aee6ad2db8f99cda17b0f5f92ec20720 (diff) | |
| parent | 7a649e07830cf9aa83881b5c80bd4223b77ba523 (diff) | |
| download | ffmpeg-20aac40571a51aa5c32dc15958a73a23158986e2.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Print an error if -r and -vsync 0 are used together.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/act.c')
0 files changed, 0 insertions, 0 deletions