Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 22:04:22 +0000 (00:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 22:04:22 +0000 (00:04 +0200)
commit28c03195174719c6683ecd3c411eb35e5bb29a38
treebd080c4cded2d940113098761eb362b3cb71ca37
parent96761e9306a9f96abaaa6bf53fe48c4d6872f48e
parentd6902070c52151ec1e8154ce9b22283a1d0bc192
Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'

* commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192':
  dsicin: Split audio and video decoder

Conflicts:
libavcodec/Makefile
libavcodec/dsicinvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/dsicinaudio.c
libavcodec/dsicinvideo.c