Merge commit '9ba27c2348d26000257e891e40a72facb0d916be'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Mar 2015 00:25:16 +0000 (01:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Mar 2015 00:25:20 +0000 (01:25 +0100)
* commit '9ba27c2348d26000257e891e40a72facb0d916be':
  qsvdec: add 'decode' to the non-static function names

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

Simple merge
Simple merge
Simple merge