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)
* commit '08859d19b429c522d6494c186656f4a2d3ff8e21':
  4xm: use the correct logging context
  g2meet: Fix a typo in the height comparison

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/4xm.c

Simple merge