[FFmpeg-cvslog] Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  8 04:48:39 2013 +0200| [b5a87dc193d6901a00aa4d195f1aae9519b8712f] | committer: Michael Niedermayer

Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'

* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
  vqavideo: check the version

Conflicts:
	libavcodec/vqavideo.c

See: b226af39107f09cd650875388250f4968eea54db

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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