Merge commit '678e455f1dc09265464b13d936d9fda62bc2bf43'

Browse Source

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

Conflicts:
	libavcodec/dxva2_h264.c

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

...

This commit is contained in:

Michael Niedermayer

2014-04-01 02:05:41 +02:00

parent d56c373391 678e455f1d

commit 9e3c8f61fe

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available