Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Jul 2014 11:39:12 +0000 (13:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Jul 2014 11:39:12 +0000 (13:39 +0200)
commit80acedae3ed55902b6a15ba5ea121a8dfc7a880a
treeacf6807b88f8bcba1f0b1c4ba5455f3a41b67a57
parent54cba3f53efd80442015a0ba5ba25252e8096290
parentd6e1d37100af568211f28ec0bcf7958a3a2a299e
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>
libavdevice/Makefile
libavdevice/oss_audio.c
libavdevice/oss_audio.h
libavdevice/oss_audio_dec.c
libavdevice/oss_audio_enc.c