Merge commit '08859d19b429c522d6494c186656f4a2d3ff8e21'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 07:41:27 +0000 (09:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 07:41:45 +0000 (09:41 +0200)
commit5c3e5651dd88af5da86ef08f01e865bfdea36a3a
tree68b75a2086167ae33763d33e522cc82c763c41ef
parent443b29e475a63cbfc573bddf46c4cb5ce7b5f461
parent08859d19b429c522d6494c186656f4a2d3ff8e21
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>
libavcodec/4xm.c