Commit 5af0fe17 authored by Jan Gerber's avatar Jan Gerber
Browse files

update ffmpeg, apply patches in get_ffmpeg_svn.sh, use GPL3

parent 2c172d25
This diff is collapsed.
svn
- use a/v sync from input container
this should fix many issues that came up with variable framerate inputs
- include metadata from source in --info json output
- update GPL to version 3
- update fmpeg
0.25 2009-09-28
- fix input from codecs where width/height is not encoded width/height
......
FFMPEG_REVISION=19439
FFMPEG_REVISION=20639
FFMPEG_CO_DIR=ffmpeg
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
# Because ffmpeg checks out libswscale via an svn:externals, checking
# out an old ffmpeg does not check out a corresponding libswscale.
# Keep the swscale checkout manually synchronized, then. Update this
# when you update FFMPEG_REVISION.
FFMPEG_EXTERNALS_REVISION=29418
FFMPEG_EXTERNALS_REVISION=29969
......@@ -6,7 +6,8 @@
#apt-get install liba52-dev libfaad-dev libgsm1-dev
#extra="$extra --enable-libfaad --enable-libgsm"
common="--enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
common="--enable-version3 --enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
common="$common --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-doc"
#linux
options="$common --enable-pthreads $extra"
......@@ -21,6 +22,16 @@ uname | grep MINGW && options="$common --enable-memalign-hack --enable-mingw32 -
svn -r $FFMPEG_REVISION co $FFMPEG_SVN $FFMPEG_CO_DIR
svn update -r $FFMPEG_EXTERNALS_REVISION $FFMPEG_CO_DIR/libswscale
apply_patches() {
cd ffmpeg
for patch in ../patches/*.patch; do
patch -p0 < $patch
done
touch .ffmpeg2theora_patched
cd ..
}
test -e ffmpeg/.ffmpeg2theora_patched || apply_patches
#configure and build ffmpeg
cd ffmpeg && ./configure $options && make
/* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
/*
* ffmpeg2theora.c -- Convert ffmpeg supported a/v files to Ogg Theora / Ogg Vorbis
* Copyright (C) 2003-2008 <j@v2v.cc>
* avinfo.c -- Convert ffmpeg supported a/v files to Ogg Theora / Vorbis
* Copyright (C) 2003-2009 <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
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
......@@ -16,9 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* along with This program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined(_GNU_SOURCE)
......
/* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
/*
* ffmpeg2theora.c -- Convert ffmpeg supported a/v files to Ogg Theora / Ogg Vorbis
* Copyright (C) 2003-2008 <j@v2v.cc>
* ffmpeg2theora.c -- Convert ffmpeg supported a/v files to Ogg Theora / Vorbis
* Copyright (C) 2003-2009 <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
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
......@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* along with This program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdio.h>
......
......@@ -5,9 +5,9 @@
*
* Contributed by Chris Pearce <chris@pearce.org.nz>.
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
......@@ -16,9 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* along with This program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdlib.h>
......
......@@ -5,9 +5,9 @@
*
* Contributed by Chris Pearce <chris@pearce.org.nz>.
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
......@@ -16,9 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* along with This program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __INDEX_H__
......
/* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
/*
* subtitles.c -- Kate Subtitles
* Copyright (C) 2007-2008 <j@v2v.cc>
* Copyright (C) 2003-2009 <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
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
......@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* along with This program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdio.h>
......
/* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
/*
* theorautils.c - Ogg Theora/Ogg Vorbis Abstraction and Muxing
* Copyright (C) 2003-2008 <j@v2v.cc>
* Copyright (C) 2003-2009 <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
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
......@@ -14,9 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* along with This program. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined(_GNU_SOURCE)
......
/* -*- tab-width:4;c-file-style:"cc-mode"; -*- */
/*
* theorautils.h -- Ogg Theora/Ogg Vorbis Abstraction and Muxing
* Copyright (C) 2003-2005 <j@v2v.cc>
* Copyright (C) 2003-2009 <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
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
......@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with This program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _F2T_THEORAUTILS_H_
#define _F2T_THEORAUTILS_H_
......
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