Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 02:48:39 +0000 (04:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 02:53:52 +0000 (04:53 +0200)
* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
  vqavideo: check the version

Conflicts:
libavcodec/vqavideo.c

See: b226af39107f09cd650875388250f4968eea54db

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

Simple merge