Split codec-regression.sh, put all the code which can be shared by

[ffmpeg] / libavdevice / beosaudio.cpp

diff --git a/libavdevice/beosaudio.cpp b/libavdevice/beosaudio.cpp
index 84e7c779051a9490f7639376d1e5576429161500..c22cb9bcb49e5d82d0fee2d658b6c46732dd46ad 100644 (file)
--- a/libavdevice/beosaudio.cpp
+++ b/libavdevice/beosaudio.cpp
@@ -1,6 +1,6 @@
 /*
  * BeOS audio play interface
- * Copyright (c) 2000, 2001 Fabrice Bellard.
+ * Copyright (c) 2000, 2001 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -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,
 };
 
@@ -439,7 +441,7 @@ AVOutputFormat audio_beos_muxer = {
     "",
     "",
     sizeof(AudioData),
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
     CODEC_ID_PCM_S16BE,
 #else
     CODEC_ID_PCM_S16LE,