summaryrefslogtreecommitdiff
path: root/libavcodec/dsicinvideo.c
Commit message (Collapse)AuthorAge
* Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'Michael Niedermayer2014-07-07
| | | | | | | | | | | * commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192': dsicin: Split audio and video decoder Conflicts: libavcodec/Makefile libavcodec/dsicinvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* dsicin: Split audio and video decoderNidhi Makhijani2014-07-06
Signed-off-by: Diego Biurrun <diego@biurrun.de>