Commit 03bbb8ee authored by Jan Gerber's avatar Jan Gerber
Browse files

use GPL 2 or later, to make use of some decoders only available in GPL 2 version of ffmpeg

parent 48de6006
This diff is collapsed.
svn 2011-09-15
- use GPL 2 or later, to make use of some decoders only available
in GPL 2 version of ffmpeg
- update to current ffmpeg api
- output version information of libraries used
0.28 2011-07-30 0.28 2011-07-30
- select resize method via commandline - select resize method via commandline
- fix 5.1 channel ordering - fix 5.1 channel ordering
......
#!/bin/sh #!/bin/sh
common="--enable-version3 --enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis" common="--enable-version2 --enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
common="$common --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --disable-doc" common="$common --disable-avconv --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --disable-doc"
#optional, if you have those libs installed: #optional, if you have those libs installed(requires GPL3):
#extra="$extra --enable-libopencore-amrnb --enable-libopencore-amrwb" #extra="$extra --enable-version3 --enable-libopencore-amrnb --enable-libopencore-amrwb"
#apt-get install liba52-dev libgsm1-dev #apt-get install liba52-dev libgsm1-dev
#extra="$extra --enable-libgsm" #extra="$extra --enable-libgsm"
......
/* -*- tab-width:4;c-file-style:"cc-mode"; -*- */ /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
/* /*
* avinfo.c -- Convert ffmpeg supported a/v files to Ogg Theora / Vorbis * avinfo.c -- Convert ffmpeg supported a/v files to Ogg Theora / Vorbis
* Copyright (C) 2003-2009 <j@v2v.cc> * Copyright (C) 2003-2011 <j@v2v.cc>
* *
* gcc -o avinfo avinfo.c -DAVINFO `pkg-config --cflags --libs libavcodec libavformat` * gcc -o avinfo avinfo.c -DAVINFO `pkg-config --cflags --libs libavcodec libavformat`
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
......
/* -*- tab-width:4;c-file-style:"cc-mode"; -*- */ /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
/* /*
* ffmpeg2theora.c -- Convert ffmpeg supported a/v files to Ogg Theora / Vorbis * ffmpeg2theora.c -- Convert ffmpeg supported a/v files to Ogg Theora / Vorbis
* Copyright (C) 2003-2009 <j@v2v.cc> * Copyright (C) 2003-2011 <j@v2v.cc>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
......
/* -*- tab-width:4;c-file-style:"cc-mode"; -*- */ /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
/* /*
* subtitles.c -- Kate Subtitles * subtitles.c -- Kate Subtitles
* Copyright (C) 2003-2009 <j@v2v.cc> * Copyright (C) 2003-2011 <j@v2v.cc>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
......
/* -*- tab-width:4;c-file-style:"cc-mode"; -*- */ /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
/* /*
* theorautils.c - Ogg Theora/Ogg Vorbis Abstraction and Muxing * theorautils.c - Ogg Theora/Ogg Vorbis Abstraction and Muxing
* Copyright (C) 2003-2009 <j@v2v.cc> * Copyright (C) 2003-2011 <j@v2v.cc>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment