eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-17 12:30:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
05cc8c8e4b7008ff3be8ec477c901b2ceca4b16b
ffmpeg/libavcodec/dsicinvideo.c
Michael Niedermayer 28c0319517 Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192' 
* commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192':
  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

9.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink