diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:37:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:37:59 +0200 |
| commit | 7eb959bf0b961e308e3068f161ee94e82e02355d (patch) | |
| tree | 3dddbd13b59e7a3b42032b8022df5fa76b98992f /cmdutils.h | |
| parent | 1b6172dcf619156b777fc29ae82e90fd42328fc0 (diff) | |
| parent | 04ccd584a70fad4ebb29ca340d704970ff313cbc (diff) | |
| download | ffmpeg-7eb959bf0b961e308e3068f161ee94e82e02355d.tar.gz | |
Merge commit '04ccd584a70fad4ebb29ca340d704970ff313cbc'
* commit '04ccd584a70fad4ebb29ca340d704970ff313cbc':
pixfmt: mark further reserved values
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.h')
0 files changed, 0 insertions, 0 deletions