[FFmpeg-cvslog] reverts parts of commit de11ee906ed232157392924735c18ab7d8522ccb. The author of this patch has a poor understanding of the code

Michael Niedermayer git at videolan.org
Fri Mar 18 18:13:35 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 18 13:16:14 2011 +0100| [133055c5e47b047b0806ccdeb42b82e418bd5dfa] | committer: Michael Niedermayer

reverts parts of commit de11ee906ed232157392924735c18ab7d8522ccb. The author of this patch has a poor understanding of the code

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=133055c5e47b047b0806ccdeb42b82e418bd5dfa
---

 libavformat/asfdec.c   |    1 -
 libavformat/avformat.h |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index cdde5ae..71f4e79 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -235,7 +235,6 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
     if (!asf_st)
         return AVERROR(ENOMEM);
     st->priv_data = asf_st;
-    st->start_time = 0;
     start_time = asf->hdr.preroll;
 
     asf_st->stream_language_index = 128; // invalid stream index means no language info
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 0471fd6..7990ce7 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -534,6 +534,8 @@ typedef struct AVStream {
      * Only set this if you are absolutely 100% sure that the value you set
      * it to really is the pts of the first frame.
      * This may be undefined (AV_NOPTS_VALUE).
+     * @note The ASF header does NOT contain a correct start_time the ASF
+     * demuxer must NOT set this.
      */
     int64_t start_time;
 




More information about the ffmpeg-cvslog mailing list