Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 15:01:59 +0000 (16:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 15:02:13 +0000 (16:02 +0100)
* qatar/master:
  dxva2: Log errors verbosely

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

Simple merge