diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-19 13:39:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-19 13:39:12 +0200 |
| commit | 80acedae3ed55902b6a15ba5ea121a8dfc7a880a (patch) | |
| tree | acf6807b88f8bcba1f0b1c4ba5455f3a41b67a57 /libavcodec/x86 | |
| parent | 54cba3f53efd80442015a0ba5ba25252e8096290 (diff) | |
| parent | d6e1d37100af568211f28ec0bcf7958a3a2a299e (diff) | |
| download | ffmpeg-80acedae3ed55902b6a15ba5ea121a8dfc7a880a.tar.gz | |
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>
Diffstat (limited to 'libavcodec/x86')
0 files changed, 0 insertions, 0 deletions