diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-24 01:09:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-24 01:09:38 +0200 |
| commit | faa1d4b1340f493ddc703706c9ab62bfc64835de (patch) | |
| tree | 528e092037b44ce6d71ef3c76cbaec10ea1fef07 /libavcodec/g2meet.c | |
| parent | f6e772f9b5cf9040c268caed8b027a9c186812ef (diff) | |
| parent | ab72eda15e98197cf148abc08574206cfde0d9b0 (diff) | |
| download | ffmpeg-faa1d4b1340f493ddc703706c9ab62bfc64835de.tar.gz | |
Merge commit 'ab72eda15e98197cf148abc08574206cfde0d9b0'
* commit 'ab72eda15e98197cf148abc08574206cfde0d9b0':
pixfmt: mark the reserved values
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g2meet.c')
0 files changed, 0 insertions, 0 deletions