[FFmpeg-devel] [PATCH] issue251, xvid within .ogm will not remux to .avi

[Michael Niedermayer]

Hi

The patch below will fix remuxing from some ogm. Iam not 100% sure that
this is the correct solution though ...

Index: libavformat/oggdec.c
===================================================================
--- libavformat/oggdec.c	(revision 13251)
+++ libavformat/oggdec.c	(working copy)
@@ -425,7 +425,7 @@
 
     if(os->codec->gptopts){
         pts = os->codec->gptopts(s, i, gp);
-    } else {
+    } else if(gp){
         pts = gp;
     }
 
Index: tests/seek.regression.ref
===================================================================
--- tests/seek.regression.ref	(revision 13251)
+++ tests/seek.regression.ref	(working copy)
@@ -3255,7 +3255,7 @@
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ----------------
 tests/data/b-libav.ogg
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:-1 size:1364 flags:1
+ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:-1 size:1364 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:-1 size:1390 flags:1
 ret: 0 st:-1 ts:1.894167 flags:1

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Thouse who are best at talking, realize last or never when they are wrong.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20080526/76627fc1/attachment.pgp>