Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 00:21:38 +0000 (02:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 00:21:38 +0000 (02:21 +0200)
commitf08b0ff051c3bfa0027b435e6e9862d18da310d5
tree3f3a96160654804b42dd7f0b5d258e064525bdfa
parentf86b2e4f499a36fd8bb084d7bbd8384ed26ba1cd
parent5fed47b94f889b724b3214a0898aa6eac00ac575
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  vmd: refactor the inner decode loop

Conflicts:
libavcodec/vmdav.c

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