[FFmpeg-cvslog] Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'
Michael Niedermayer
git at videolan.org
Sat Jul 19 13:45:21 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 19 13:39:12 2014 +0200| [80acedae3ed55902b6a15ba5ea121a8dfc7a880a] | committer: Michael Niedermayer
Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'
* commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e':
oss_audio: Split muxer and demuxer
Conflicts:
libavdevice/Makefile
libavdevice/oss_audio.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80acedae3ed55902b6a15ba5ea121a8dfc7a880a
---
More information about the ffmpeg-cvslog
mailing list