highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
530bf8ece6f828262b211edab1b97b873569b255
ffmpeg/libavdevice/oss_audio_enc.c
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

3.3 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink