[SCM] libav/experimental: oggdec: Check that we have a codec in gptopts (needed for skeleton)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:04:08 UTC 2013


The following commit has been merged in the experimental branch:
commit 296bdf9cf1ab6689a9db14ee53e29a10e94a6578
Author: David Conrad <lessen42 at gmail.com>
Date:   Thu Mar 11 07:17:36 2010 +0000

    oggdec: Check that we have a codec in gptopts (needed for skeleton)
    
    Originally committed as revision 22456 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index aa6e899..170455a 100644
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -134,7 +134,7 @@ ogg_gptopts (AVFormatContext * s, int i, uint64_t gp, int64_t *dts)
     struct ogg_stream *os = ogg->streams + i;
     uint64_t pts = AV_NOPTS_VALUE;
 
-    if(os->codec->gptopts){
+    if(os->codec && os->codec->gptopts){
         pts = os->codec->gptopts(s, i, gp, dts);
     } else {
         pts = gp;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list