diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 00:04:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 00:04:22 +0200 |
| commit | 28c03195174719c6683ecd3c411eb35e5bb29a38 (patch) | |
| tree | bd080c4cded2d940113098761eb362b3cb71ca37 /libavdevice/alsa-audio-enc.c | |
| parent | 96761e9306a9f96abaaa6bf53fe48c4d6872f48e (diff) | |
| parent | d6902070c52151ec1e8154ce9b22283a1d0bc192 (diff) | |
| download | ffmpeg-28c03195174719c6683ecd3c411eb35e5bb29a38.tar.gz | |
Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'
* commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192':
dsicin: Split audio and video decoder
Conflicts:
libavcodec/Makefile
libavcodec/dsicinvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio-enc.c')
0 files changed, 0 insertions, 0 deletions