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

Merge commit '2fc85fe9' 


* commit '2fc85fe9':
  bmv: Split audio and video decoder

Conflicts:
	libavcodec/bmvvideo.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 8be23d42 2fc85fe9
No related branches found
No related tags found
No related merge requests 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