Commit 58f873dd authored by Reimar Döffinger's avatar Reimar Döffinger

Fix compilation of beosaudio.cpp, not tested if it actually works though.

Originally committed as revision 20098 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f494213c
...@@ -297,11 +297,12 @@ static int audio_write_header(AVFormatContext *s1) ...@@ -297,11 +297,12 @@ static int audio_write_header(AVFormatContext *s1)
return 0; return 0;
} }
static int audio_write_packet(AVFormatContext *s1, int stream_index, static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt)
const uint8_t *buf, int size, int64_t force_pts)
{ {
AudioData *s = (AudioData *)s1->priv_data; AudioData *s = (AudioData *)s1->priv_data;
int len, ret; int len, ret;
const uint8_t *buf = pkt->data;
int size = pkt->size;
#ifdef LATENCY_CHECK #ifdef LATENCY_CHECK
bigtime_t lat1, lat2; bigtime_t lat1, lat2;
lat1 = s->player->Latency(); lat1 = s->player->Latency();
...@@ -372,7 +373,7 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap) ...@@ -372,7 +373,7 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap)
st->codec->sample_rate = s->sample_rate; st->codec->sample_rate = s->sample_rate;
st->codec->channels = s->channels; st->codec->channels = s->channels;
return 0; 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) static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)
...@@ -430,6 +431,7 @@ static AVInputFormat audio_beos_demuxer = { ...@@ -430,6 +431,7 @@ static AVInputFormat audio_beos_demuxer = {
audio_read_packet, audio_read_packet,
audio_read_close, audio_read_close,
NULL, NULL,
NULL,
AVFMT_NOFILE, AVFMT_NOFILE,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment