Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avdevice/oss_audio: avoid strerror() and errbuf

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/96/head
Michael Niedermayer 10 years ago
parent e60c025e73
commit afbaa9a737
1 changed files with 4 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      libavdevice/oss_audio.c

10
libavdevice/oss_audio.c
Unescape View File

@ -49,14 +49,13 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
int audio_fd; int audio_fd;
int tmp, err; int tmp, err;
char *flip = getenv("AUDIO_FLIP_LEFT"); char *flip = getenv("AUDIO_FLIP_LEFT");
char errbuff[128];
if (is_output) if (is_output)
audio_fd = avpriv_open(audio_device, O_WRONLY); audio_fd = avpriv_open(audio_device, O_WRONLY);
else else
audio_fd = avpriv_open(audio_device, O_RDONLY); audio_fd = avpriv_open(audio_device, O_RDONLY);
if (audio_fd < 0) { if (audio_fd < 0) {
av_log(s1, AV_LOG_ERROR, "%s: %s\n", audio_device, strerror(errno)); av_log(s1, AV_LOG_ERROR, "%s: %s\n", audio_device, av_err2str(AVERROR(errno)));
return AVERROR(EIO); return AVERROR(EIO);
} }
@ -67,7 +66,7 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
/* non blocking mode */ /* non blocking mode */
if (!is_output) { if (!is_output) {
if (fcntl(audio_fd, F_SETFL, O_NONBLOCK) < 0) { if (fcntl(audio_fd, F_SETFL, O_NONBLOCK) < 0) {
av_log(s1, AV_LOG_WARNING, "%s: Could not enable non block mode (%s)\n", audio_device, strerror(errno)); av_log(s1, AV_LOG_WARNING, "%s: Could not enable non block mode (%s)\n", audio_device, av_err2str(AVERROR(errno)));
} }
} }
@ -75,8 +74,7 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
#define CHECK_IOCTL_ERROR(event) \ #define CHECK_IOCTL_ERROR(event) \
if (err < 0) { \ if (err < 0) { \
av_strerror(AVERROR(errno), errbuff, sizeof(errbuff)); \ av_log(s1, AV_LOG_ERROR, #event ": %s\n", av_err2str(AVERROR(errno)));\
av_log(s1, AV_LOG_ERROR, #event ": %s\n", errbuff); \
goto fail; \ goto fail; \
} }
@ -86,7 +84,7 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
* fail anyway. */ * fail anyway. */
err = ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &tmp); err = ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &tmp);
if (err < 0) { if (err < 0) {
av_log(s1, AV_LOG_WARNING, "SNDCTL_DSP_GETFMTS: %s\n", strerror(errno)); av_log(s1, AV_LOG_WARNING, "SNDCTL_DSP_GETFMTS: %s\n", av_err2str(AVERROR(errno)));
} }
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN

Write Preview
Loading…
Cancel
Save