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

Merge commit 'd6902070' 


* commit 'd6902070':
  dsicin: Split audio and video decoder

Conflicts:
	libavcodec/Makefile
	libavcodec/dsicinvideo.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 96761e93 d6902070
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