[SCM] libav/experimental: Allow NULL for read_header in AVInputFormat. See discussion in "[PATCH] allow empty params for av_open_input_stream()".

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:24:40 UTC 2013


The following commit has been merged in the experimental branch:
commit e145ce202757dc4654c3e07e3f788dc385016074
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date:   Thu Jul 3 12:10:54 2008 +0000

    Allow NULL for read_header in AVInputFormat. See discussion in "[PATCH] allow
    empty params for av_open_input_stream()".
    
    Originally committed as revision 14059 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 63dd959..794baba 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -394,9 +394,11 @@ int av_open_input_stream(AVFormatContext **ic_ptr,
         ic->priv_data = NULL;
     }
 
+    if (ic->iformat->read_header) {
     err = ic->iformat->read_header(ic, ap);
     if (err < 0)
         goto fail;
+    }
 
     if (pb && !ic->data_offset)
         ic->data_offset = url_ftell(ic->pb);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list