RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
65,885 Commits 37 Branches 400 Tags 272 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer 80acedae3e Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e' 
* commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e':
  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