Merge commit '678e455f1dc09265464b13d936d9fda62bc2bf43'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 00:05:41 +0000 (02:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 00:08:19 +0000 (02:08 +0200)
* commit '678e455f1dc09265464b13d936d9fda62bc2bf43':
  dxva2: Directly use AVFrames

Conflicts:
libavcodec/dxva2_h264.c

See: 29be9b5301212d29186a05f262a6ce04ddbc168c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge