Skip to content
Snippets Groups Projects
Commit c103d5f5 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge remote-tracking branch 'qatar/master' 


* qatar/master:
  wmall: use AVFrame API properly

Conflicts:
	libavcodec/wmalosslessdec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents f18ccb52 3ca5df36
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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