Merge commit '990e4a6639d0714198583c2812b1074b5751898f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:30:20 +0000 (00:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:30:20 +0000 (00:30 +0100)
commite73b3dba3e8084eb7141c2a8e27fba4950f2ba60
tree7801d9883ec0592c24b9a21264420efc58039387
parent2ab3088dda31103351eb839f2d53674dc2936a97
parent990e4a6639d0714198583c2812b1074b5751898f
Merge commit '990e4a6639d0714198583c2812b1074b5751898f'

* commit '990e4a6639d0714198583c2812b1074b5751898f':
  Add a QSV decoding example.

Conflicts:
configure
doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
doc/Makefile