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

Merge commit '246f8695' 


* commit '246f8695':
  vmd: Split audio and video decoder

Conflicts:
	libavcodec/vmdvideo.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 5320b34b 246f8695
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