Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'

[ffmpeg] / libavdevice / pulse_audio_enc.c

diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c
index 591e518824831e25777339c52787e9c7b89be54c..a2abc4aea5ecf0530bceb81492d132b539a36255 100644 (file)
--- a/libavdevice/pulse_audio_enc.c
+++ b/libavdevice/pulse_audio_enc.c
@@ -59,7 +59,7 @@ static av_cold int pulse_write_header(AVFormatContext *h)
             stream_name = "Playback";
     }
 
-    ss.format = codec_id_to_pulse_format(st->codec->codec_id);
+    ss.format = ff_codec_id_to_pulse_format(st->codec->codec_id);
     ss.rate = st->codec->sample_rate;
     ss.channels = st->codec->channels;
 
@@ -102,7 +102,7 @@ static int pulse_write_packet(AVFormatContext *h, AVPacket *pkt)
             av_log(s, AV_LOG_ERROR, "pa_simple_flush failed: %s\n", pa_strerror(error));
             return AVERROR(EIO);
         }
-        return 0;
+        return 1;
     }
 
     if (pkt->dts != AV_NOPTS_VALUE)