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

ChangeLog

+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
     - select resize method via commandline
     - fix 5.1 channel ordering

get_ffmpeg.sh

 #!/bin/sh
 
-common="--enable-version3 --enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
-common="$common --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --disable-doc"
+common="--enable-version2 --enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
+common="$common --disable-avconv --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --disable-doc"
 
-#optional, if you have those libs installed:
-#extra="$extra --enable-libopencore-amrnb --enable-libopencore-amrwb"
+#optional, if you have those libs installed(requires GPL3):
+#extra="$extra --enable-version3 --enable-libopencore-amrnb --enable-libopencore-amrwb"
 
 #apt-get install liba52-dev libgsm1-dev
 #extra="$extra  --enable-libgsm"

src/avinfo.c

 /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
 /*
  * 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`
  *
  * 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
- * 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.
  *
  * This program is distributed in the hope that it will be useful,

src/ffmpeg2theora.c

 /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
 /*
  * 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
  * 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.
  *
  * This program is distributed in the hope that it will be useful,

src/index.c

@@ -7,7 +7,7 @@
  *
  * 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
- * 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.
  *
  * This program is distributed in the hope that it will be useful,

src/index.h

@@ -7,7 +7,7 @@
  *
  * 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
- * 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.
  *
  * This program is distributed in the hope that it will be useful,

src/subtitles.c

 /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
 /*
  * 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
  * 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.
  *
  * This program is distributed in the hope that it will be useful,

src/theorautils.c

 /* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
 /*
  * 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
  * 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.
  *
  * This program is distributed in the hope that it will be useful,

src/theorautils.h

@@ -5,7 +5,7 @@
  *
  * 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
- * 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.
  *
  * This program is distributed in the hope that it will be useful,