eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 03:20:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
1df64d6c46ed522e74ebf082a0ea3f0dcadc1950
ffmpeg/libavformat/allformats.c
Michael Niedermayer e821910a21 Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499' 
* commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
  lavf: Add DSS demuxer

Conflicts:
	libavformat/Makefile
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 21:44:58 +01:00

18 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink