Merge commit '6477449243db4aab15a4db356e8354c60b5366ec'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Feb 2014 22:04:15 +0000 (23:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Feb 2014 22:12:29 +0000 (23:12 +0100)
* commit '6477449243db4aab15a4db356e8354c60b5366ec':
  g2meet: make JPEG tile decoder operate on 8x8 block mask

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

Simple merge