[SCM] libav/experimental: export pts if available

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:40:11 UTC 2013


The following commit has been merged in the experimental branch:
commit c0c37848d8c571b13c5fe443f6d0811ac2d3cc36
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Apr 27 03:35:14 2004 +0000

    export pts if available
    
    Originally committed as revision 3081 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/ogg.c b/libavformat/ogg.c
index 65c507c..61a9212 100644
--- a/libavformat/ogg.c
+++ b/libavformat/ogg.c
@@ -172,6 +172,7 @@ static int ogg_read_header(AVFormatContext *avfcontext, AVFormatParameters *ap)
     int i;
      
     avfcontext->ctx_flags |= AVFMTCTX_NOHEADER;
+    av_set_pts_info(avfcontext, 60, 1, AV_TIME_BASE);
      
     ogg_sync_init(&context->oy) ;
     buf = ogg_sync_buffer(&context->oy, DECODER_BUFFER_SIZE) ;
@@ -218,6 +219,9 @@ static int ogg_read_packet(AVFormatContext *avfcontext, AVPacket *pkt) {
 	return -EIO ;
     pkt->stream_index = 0 ;
     memcpy(pkt->data, op.packet, op.bytes);
+    if(avfcontext->streams[0]->codec.sample_rate && op.granulepos!=-1)
+        pkt->pts= av_rescale(op.granulepos, AV_TIME_BASE, avfcontext->streams[0]->codec.sample_rate);
+//    printf("%lld %d %d\n", pkt->pts, (int)op.granulepos, avfcontext->streams[0]->codec.sample_rate);
 
     return op.bytes;
 }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list