eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
68717 commits 37 branches 405 tags 511 MiB
Commit graph

2 commits

Author SHA1 Message Date
Michael Niedermayer
80acedae3e Merge commit 'd6e1d37100' 
* commit 'd6e1d37100':
  oss_audio: Split muxer and demuxer

Conflicts:
	libavdevice/Makefile
	libavdevice/oss_audio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-19 13:39:12 +02:00
Nidhi Makhijani
d6e1d37100 oss_audio: Split muxer and demuxer 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-18 15:04:25 -07:00