From 3d4589551d84659dad147e4950659e2d09cf9936 Mon Sep 17 00:00:00 2001 From: Mihuleac Sergiu Date: Tue, 15 Dec 2015 12:16:16 +0200 Subject: [PATCH 1/2] Markdown edited! --- README | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/README b/README index fe0524b..37e8bb0 100644 --- a/README +++ b/README @@ -1,26 +1,24 @@ -*** Development repository for PyFFmpeg *** +Development repository for PyFFmpeg +== -Official project Web site: https://mhaller.github.io/pyffmpeg +Official project Web site: [https://mhaller.github.io/pyffmpeg](https://mhaller.github.io/pyffmpeg) -Legacy project Web site: http://code.google.com/p/pyffmpeg -Legacy releases: http://code.google.com/p/pyffmpeg/downloads/list +Legacy project Web site: [http://code.google.com/p/pyffmpeg](http://code.google.com/p/pyffmpeg) + +Legacy releases: [http://code.google.com/p/pyffmpeg/downloads/list](http://code.google.com/p/pyffmpeg/downloads/list) Feedback is welcome at or use pull requests. This PyFFmpeg version *DOES NOT work* (work in progress), but should work with - Python - - Python 2.7.9 - - Cython +Python `Python 2.7.9` - Cython 0.17.4 +Cython `Cython 0.17.4` FFmpeg (git://git.ffmpeg.org/ffmpeg.git) FFmpeg version 2.6.1 (released at http://ffmpeg.org/download.html) - with its libraries + with its libraries libavutil 54. 20.100 / 54. 20.100 libavcodec 56. 26.100 / 56. 26.100 libavformat 56. 25.101 / 56. 25.101 @@ -31,21 +29,21 @@ This PyFFmpeg version *DOES NOT work* (work in progress), but should work with libswresample 1. 1.100 / 1. 1.100 libpostproc 53. 3.100 / 53. 3.100 - Operating System +Operating System MacOS X 10.10.2 - untested + Untested Windows (mingw) Unix You can install and test PyFFmpeg as follows: - 1. Edit setup.py and adapt ffmpegpath to your configuration +1. Edit `setup.py` and adapt `ffmpegpath` to your configuration - 2. Execute "sudo python setup.py install" +2. Execute `sudo python setup.py install` - 3. Check if PyFFmpeg is working using the testInstalledPyFFmpeg.py file +3. Check if `PyFFmpeg` is working using the `testInstalledPyFFmpeg.py` file Please report issues as well as configuration details for your working PyFFmpeg installations at From 5b3df521c9d3a6f5ce78175b446f687c744f2ad5 Mon Sep 17 00:00:00 2001 From: Mihuleac Sergiu Date: Tue, 15 Dec 2015 12:17:58 +0200 Subject: [PATCH 2/2] Markedon Edited! --- README => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README => README.md (100%) diff --git a/README b/README.md similarity index 100% rename from README rename to README.md