Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavdevice / openal-dec.c

diff --git a/libavdevice/openal-dec.c b/libavdevice/openal-dec.c
index 1b70525c774ba5ec5a413e008a65ddde870ce3a5..2227d6350bc0d06529a49f67e3b4c778500b38d8 100644 (file)
--- a/libavdevice/openal-dec.c
+++ b/libavdevice/openal-dec.c
@@ -25,6 +25,7 @@
 #include <AL/alc.h>
 
 #include "libavutil/opt.h"
+#include "libavformat/internal.h"
 #include "avdevice.h"
 
 typedef struct {
@@ -116,7 +117,7 @@ static inline void print_al_capture_devices(void *log_ctx)
         av_log(log_ctx, AV_LOG_INFO, "  %s\n", devices);
 }
 
-static int read_header(AVFormatContext *ctx, AVFormatParameters *ap)
+static int read_header(AVFormatContext *ctx)
 {
     al_data *ad = ctx->priv_data;
     static const ALCenum sample_formats[2][2] = {
@@ -145,13 +146,13 @@ static int read_header(AVFormatContext *ctx, AVFormatParameters *ap)
     if (error = al_get_error(ad->device, &error_msg)) goto fail;
 
     /* Create stream */
-    if (!(st = av_new_stream(ctx, 0))) {
+    if (!(st = avformat_new_stream(ctx, NULL))) {
         error = AVERROR(ENOMEM);
         goto fail;
     }
 
     /* We work in microseconds */
-    av_set_pts_info(st, 64, 1, 1000000);
+    avpriv_set_pts_info(st, 64, 1, 1000000);
 
     /* Set codec parameters */
     codec = st->codec;