[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/9' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  3 02:21:38 2013 +0200| [f08b0ff051c3bfa0027b435e6e9862d18da310d5] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f08b0ff051c3bfa0027b435e6e9862d18da310d5
---