Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Jun 2013 09:53:27 +0000 (11:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Jun 2013 09:53:27 +0000 (11:53 +0200)
* qatar/master:
  g2meet: do not leak buffers
  g2meet: more graceful cursor loading
  g2meet: reset dimensions on header parsing errors

Conflicts:
libavcodec/g2meet.c

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

Simple merge