d6902070c5
* commit 'd6902070c5': dsicin: Split audio and video decoder Conflicts: libavcodec/Makefile libavcodec/dsicinvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Diego Biurrun <diego@biurrun.de>