diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-18 16:47:10 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-18 16:47:10 -0400 |
| commit | 3e8610464106337dc3d32b015371c639994e9e57 (patch) | |
| tree | d38dd54c5b2b73cdd84d947767d2dea7e240fc69 /MediaBrowser.Controller/FFMpeg | |
| parent | 59a3dcc8c1c6b41560bd48507cfcf4f0ca0a8862 (diff) | |
Moved ffmpeg to the controller project and added ffprobe
Diffstat (limited to 'MediaBrowser.Controller/FFMpeg')
| -rw-r--r-- | MediaBrowser.Controller/FFMpeg/ffmpeg.exe.REMOVED.git-id | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/FFMpeg/ffprobe.exe.REMOVED.git-id | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/FFMpeg/readme.txt | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/FFMpeg/ffmpeg.exe.REMOVED.git-id b/MediaBrowser.Controller/FFMpeg/ffmpeg.exe.REMOVED.git-id new file mode 100644 index 0000000000..30743c0548 --- /dev/null +++ b/MediaBrowser.Controller/FFMpeg/ffmpeg.exe.REMOVED.git-id @@ -0,0 +1 @@ +faf137524dd67edb423344830e1436dcdca83daf
\ No newline at end of file diff --git a/MediaBrowser.Controller/FFMpeg/ffprobe.exe.REMOVED.git-id b/MediaBrowser.Controller/FFMpeg/ffprobe.exe.REMOVED.git-id new file mode 100644 index 0000000000..4ad2356c9e --- /dev/null +++ b/MediaBrowser.Controller/FFMpeg/ffprobe.exe.REMOVED.git-id @@ -0,0 +1 @@ +a304265e8410291c1f696e74a4f9b84970bb5753
\ No newline at end of file diff --git a/MediaBrowser.Controller/FFMpeg/readme.txt b/MediaBrowser.Controller/FFMpeg/readme.txt new file mode 100644 index 0000000000..cdb039bdca --- /dev/null +++ b/MediaBrowser.Controller/FFMpeg/readme.txt @@ -0,0 +1,3 @@ +This is the 32-bit static build of ffmpeg, located at:
+
+http://ffmpeg.zeranoe.com/builds/
\ No newline at end of file |