diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 09:41:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 09:41:45 +0200 |
| commit | 5c3e5651dd88af5da86ef08f01e865bfdea36a3a (patch) | |
| tree | 68b75a2086167ae33763d33e522cc82c763c41ef /libavformat/4xm.c | |
| parent | 443b29e475a63cbfc573bddf46c4cb5ce7b5f461 (diff) | |
| parent | 08859d19b429c522d6494c186656f4a2d3ff8e21 (diff) | |
| download | ffmpeg-5c3e5651dd88af5da86ef08f01e865bfdea36a3a.tar.gz | |
Merge commit '08859d19b429c522d6494c186656f4a2d3ff8e21'
* commit '08859d19b429c522d6494c186656f4a2d3ff8e21':
4xm: use the correct logging context
g2meet: Fix a typo in the height comparison
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/4xm.c')
0 files changed, 0 insertions, 0 deletions