[SCM] libav/experimental: Fix compilation of beosaudio.cpp, not tested if it actually works though.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:52:13 UTC 2013


The following commit has been merged in the experimental branch:
commit 58f873dded3f43755fdd396145f246c91124f9eb
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Wed Sep 30 13:01:48 2009 +0000

    Fix compilation of beosaudio.cpp, not tested if it actually works though.
    
    Originally committed as revision 20098 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavdevice/beosaudio.cpp b/libavdevice/beosaudio.cpp
index c98a239..c22cb9b 100644
--- a/libavdevice/beosaudio.cpp
+++ b/libavdevice/beosaudio.cpp
@@ -297,11 +297,12 @@ static int audio_write_header(AVFormatContext *s1)
     return 0;
 }
 
-static int audio_write_packet(AVFormatContext *s1, int stream_index,
-                              const uint8_t *buf, int size, int64_t force_pts)
+static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt)
 {
     AudioData *s = (AudioData *)s1->priv_data;
     int len, ret;
+    const uint8_t *buf = pkt->data;
+    int size = pkt->size;
 #ifdef LATENCY_CHECK
 bigtime_t lat1, lat2;
 lat1 = s->player->Latency();
@@ -372,7 +373,7 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap)
     st->codec->sample_rate = s->sample_rate;
     st->codec->channels = s->channels;
     return 0;
-    av_set_pts_info(s1, 48, 1, 1000000);  /* 48 bits pts in us */
+    av_set_pts_info(st, 48, 1, 1000000);  /* 48 bits pts in us */
 }
 
 static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)
@@ -430,6 +431,7 @@ static AVInputFormat audio_beos_demuxer = {
     audio_read_packet,
     audio_read_close,
     NULL,
+    NULL,
     AVFMT_NOFILE,
 };
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list