Skip to content

F
ffmpeg.wasm-core
Commit 9e3c8f61 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '678e455f' 

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

Conflicts:
	libavcodec/dxva2_h264.c

See: 29be9b53Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d56c3733 678e455f
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment