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)
commitb5a87dc193d6901a00aa4d195f1aae9519b8712f
treefa194ed2ea8784b3f59b7d90ad74a5cf44b8943b
parentf982d006bb9e5ffb6bc032e62b5f34177a83df85
parentc4abc9098cacb227dba39bac6aea16b2bceba0d0
Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'

* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
  vqavideo: check the version

Conflicts:
libavcodec/vqavideo.c

See: b226af39107f09cd650875388250f4968eea54db

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