[FFmpeg-cvslog] Merge commit '678e455f1dc09265464b13d936d9fda62bc2bf43'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  1 02:05:41 2014 +0200| [9e3c8f61feb2463c06aab4dad60de08dbee9d891] | committer: Michael Niedermayer

Merge commit '678e455f1dc09265464b13d936d9fda62bc2bf43'

* commit '678e455f1dc09265464b13d936d9fda62bc2bf43':
  dxva2: Directly use AVFrames

Conflicts:
	libavcodec/dxva2_h264.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e3c8f61feb2463c06aab4dad60de08dbee9d891
---