[xiph-commits] r16945 - in trunk/ffmpeg2theora: . patches

[j at svn.xiph.org]

Author: j
Date: 2010-03-03 07:16:00 -0800 (Wed, 03 Mar 2010)
New Revision: 16945

Removed:
   trunk/ffmpeg2theora/patches/ffmpeg_ogg_decode.patch
Modified:
   trunk/ffmpeg2theora/ffmpegrev
Log:
update ffmpeg version, remove patch, fixed in ffmpeg svn

Modified: trunk/ffmpeg2theora/ffmpegrev
===================================================================
--- trunk/ffmpeg2theora/ffmpegrev	2010-03-03 00:56:24 UTC (rev 16944)
+++ trunk/ffmpeg2theora/ffmpegrev	2010-03-03 15:16:00 UTC (rev 16945)
@@ -1,8 +1,8 @@
-FFMPEG_REVISION=21500
+FFMPEG_REVISION=22168
 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=30448
+FFMPEG_EXTERNALS_REVISION=30819

Deleted: trunk/ffmpeg2theora/patches/ffmpeg_ogg_decode.patch
===================================================================
--- trunk/ffmpeg2theora/patches/ffmpeg_ogg_decode.patch	2010-03-03 00:56:24 UTC (rev 16944)
+++ trunk/ffmpeg2theora/patches/ffmpeg_ogg_decode.patch	2010-03-03 15:16:00 UTC (rev 16945)
@@ -1,17 +0,0 @@
-Index: libavformat/oggdec.c
-===================================================================
---- libavformat/oggdec.c	(revision 21579)
-+++ libavformat/oggdec.c	(working copy)
-@@ -367,10 +367,10 @@
-
-     ogg->curidx = idx;
-
--    if (os->header < 0){
-+    if (!ogg->headers){
-         int hdr = os->codec->header (s, idx);
-+        os->header = os->seq;
-         if (!hdr){
--            os->header = os->seq;
-             os->segp = segp;
-             os->psize = psize;
-             ogg->headers = 1;