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

Merge commit 'd6e1d371' 


* commit 'd6e1d371':
  oss_audio: Split muxer and demuxer

Conflicts:
	libavdevice/Makefile
	libavdevice/oss_audio.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 54cba3f5 d6e1d371
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