RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'lukaszmluki/master' 

* lukaszmluki/master:
  lavd/pulse: add ff_ prefix and fix param type
  lavd/pulse_audio_enc: fix flush return code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-04 02:08:43 +01:00
parent 1a4ffa5b13 babf20a215
commit e135166206
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavdevice/pulse_audio_common.c
View File

@ -19,11 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h"
#include "pulse_audio_common.h"
#include "libavutil/attributes.h"
pa_sample_format_t av_cold codec_id_to_pulse_format(int codec_id)
pa_sample_format_t av_cold ff_codec_id_to_pulse_format(enum AVCodecID codec_id)
{
switch (codec_id) {
case AV_CODEC_ID_PCM_U8: return PA_SAMPLE_U8;

3
libavdevice/pulse_audio_common.h
View File

@ -23,7 +23,8 @@
#define AVDEVICE_PULSE_AUDIO_COMMON_H
#include <pulse/simple.h>
#include "libavcodec/avcodec.h"
pa_sample_format_t codec_id_to_pulse_format(int codec_id);
pa_sample_format_t ff_codec_id_to_pulse_format(enum AVCodecID codec_id);
#endif /* AVDEVICE_PULSE_AUDIO_COMMON_H */

2
libavdevice/pulse_audio_dec.c
View File

@ -57,7 +57,7 @@ static av_cold int pulse_read_header(AVFormatContext *s)
int ret;
enum AVCodecID codec_id =
s->audio_codec_id == AV_CODEC_ID_NONE ? DEFAULT_CODEC_ID : s->audio_codec_id;
const pa_sample_spec ss = { codec_id_to_pulse_format(codec_id),
const pa_sample_spec ss = { ff_codec_id_to_pulse_format(codec_id),
pd->sample_rate,
pd->channels };

4
libavdevice/pulse_audio_enc.c
View File

@ -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)