give AVInput/OutputFormat structs consistent names

[ffmpeg] / libavformat / audio.c

diff --git a/libavformat/audio.c b/libavformat/audio.c
index 054ced2266e7d960cb87b96b8dd4df3b745b0f4b..a616e6136ce78b41a2b039afd797b4c7e938f797 100644 (file)
--- a/libavformat/audio.c
+++ b/libavformat/audio.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
 
@@ -54,7 +54,7 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device)
     /* open linux audio device */
     if (!audio_device)
 #ifdef __OpenBSD__
-       audio_device = "/dev/sound";
+        audio_device = "/dev/sound";
 #else
         audio_device = "/dev/dsp";
 #endif
@@ -87,7 +87,7 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device)
 
     /* select format : favour native format */
     err = ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &tmp);
-    
+
 #ifdef WORDS_BIGENDIAN
     if (tmp & AFMT_S16_BE) {
         tmp = AFMT_S16_BE;
@@ -123,7 +123,7 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device)
         perror("SNDCTL_DSP_SETFMT");
         goto fail;
     }
-    
+
     tmp = (s->channels == 2);
     err = ioctl(audio_fd, SNDCTL_DSP_STEREO, &tmp);
     if (err < 0) {
@@ -132,7 +132,7 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device)
     }
     if (tmp)
         s->channels = 2;
-    
+
     tmp = s->sample_rate;
     err = ioctl(audio_fd, SNDCTL_DSP_SPEED, &tmp);
     if (err < 0) {
@@ -217,7 +217,7 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap)
     AVStream *st;
     int ret;
 
-    if (!ap || ap->sample_rate <= 0 || ap->channels <= 0)
+    if (ap->sample_rate <= 0 || ap->channels <= 0)
         return -1;
 
     st = av_new_stream(s1, 0);
@@ -239,7 +239,7 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap)
     st->codec->sample_rate = s->sample_rate;
     st->codec->channels = s->channels;
 
-    av_set_pts_info(st, 48, 1, 1000000);  /* 48 bits pts in us */
+    av_set_pts_info(st, 64, 1, 1000000);  /* 64 bits pts in us */
     return 0;
 }
 
@@ -249,7 +249,7 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)
     int ret, bdelay;
     int64_t cur_time;
     struct audio_buf_info abufi;
-    
+
     if (av_new_packet(pkt, s->frame_size) < 0)
         return AVERROR_IO;
     for(;;) {
@@ -271,7 +271,7 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)
         if (ret == -1 && (errno == EAGAIN || errno == EINTR)) {
             av_free_packet(pkt);
             pkt->size = 0;
-            pkt->pts = av_gettime() & ((1LL << 48) - 1);
+            pkt->pts = av_gettime();
             return 0;
         }
         if (!(ret == 0 || (ret == -1 && (errno == EAGAIN || errno == EINTR)))) {
@@ -291,7 +291,7 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)
     cur_time -= (bdelay * 1000000LL) / (s->sample_rate * s->channels);
 
     /* convert to wanted units */
-    pkt->pts = cur_time & ((1LL << 48) - 1);
+    pkt->pts = cur_time;
 
     if (s->flip_left && s->channels == 2) {
         int i;
@@ -313,7 +313,7 @@ static int audio_read_close(AVFormatContext *s1)
     return 0;
 }
 
-static AVInputFormat audio_in_format = {
+static AVInputFormat audio_demuxer = {
     "audio_device",
     "audio grab and output",
     sizeof(AudioData),
@@ -324,7 +324,7 @@ static AVInputFormat audio_in_format = {
     .flags = AVFMT_NOFILE,
 };
 
-static AVOutputFormat audio_out_format = {
+static AVOutputFormat audio_muxer = {
     "audio_device",
     "audio grab and output",
     "",
@@ -347,7 +347,7 @@ static AVOutputFormat audio_out_format = {
 
 int audio_init(void)
 {
-    av_register_input_format(&audio_in_format);
-    av_register_output_format(&audio_out_format);
+    av_register_input_format(&audio_demuxer);
+    av_register_output_format(&audio_muxer);
     return 0;
 }