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)
commitd3c4ea8b35f7d950c4853952e9044d5c96b0361b
treedf2989cede628c8177f32e55944c5c9c74799a6b
parent1163910a00595f01f5f6aabd5d69b01925429401
parent7dfc3381dd039233026cbba5f3ca3d76e28be860
Merge remote-tracking branch 'qatar/master'

* 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>
libavcodec/g2meet.c