Commit graph

2 commits

Author SHA1 Message Date
Michael Niedermayer
28c0319517 Merge commit 'd6902070c5'
* commit 'd6902070c5':
  dsicin: Split audio and video decoder

Conflicts:
	libavcodec/Makefile
	libavcodec/dsicinvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07 00:04:22 +02:00
Nidhi Makhijani
d6902070c5 dsicin: Split audio and video decoder
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-06 11:27:34 -07:00
Renamed from libavcodec/dsicinav.c (Browse further)