[SCM] libav/experimental: Fix synthetic next_pts calculation / audio pts patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 4b85a28f2766dd2896d311675e26ae0350b296ed
Author: Wolfram Gloger <wmglo at dent.med.uni-muenchen.de>
Date:   Mon Apr 26 23:06:29 2004 +0000

    Fix synthetic next_pts calculation / audio pts patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
    
    Originally committed as revision 3079 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 83582e4..f74ae77 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -986,7 +986,7 @@ static void print_report(AVFormatContext **output_files,
 /* pkt = NULL means EOF (needed to flush decoder buffers) */
 static int output_packet(AVInputStream *ist, int ist_index,
                          AVOutputStream **ost_table, int nb_ostreams,
-                         AVPacket *pkt)
+                         const AVPacket *pkt)
 {
     AVFormatContext *os;
     AVOutputStream *ost;
@@ -1036,8 +1036,8 @@ static int output_packet(AVInputStream *ist, int ist_index,
                     continue;
                 }
                 data_buf = (uint8_t *)samples;
-                ist->next_pts += ((int64_t)AV_TIME_BASE * data_size) / 
-                    (2 * ist->st->codec.channels);
+                ist->next_pts += ((int64_t)AV_TIME_BASE/2 * data_size) / 
+                    (ist->st->codec.sample_rate * ist->st->codec.channels);
                 break;
             case CODEC_TYPE_VIDEO:
                     data_size = (ist->st->codec.width * ist->st->codec.height * 3) / 2;

-- 
Libav/FFmpeg packaging