RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'b7c77912b62163b3b46ce93fe42fff3c83604c82'

Browse Source 
* commit 'b7c77912b62163b3b46ce93fe42fff3c83604c82':
  oss_audio: use a macro to simplify ioctl() error checking

Conflicts:
	libavdevice/oss_audio.c

See: 69c7aad494
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-18 23:13:00 +02:00
commit 837605704d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavdevice/oss_audio.c
View File

@ -49,6 +49,7 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
int audio_fd;
int tmp, err;
char *flip = getenv("AUDIO_FLIP_LEFT");
char errbuff[128];
if (is_output)
audio_fd = avpriv_open(audio_device, O_WRONLY);
@ -74,14 +75,15 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
#define CHECK_IOCTL_ERROR(event) \
if (err < 0) { \
av_log(s1, AV_LOG_ERROR, #event ": %s\n", strerror(errno)); \
av_strerror(AVERROR(errno), errbuff, sizeof(errbuff)); \
av_log(s1, AV_LOG_ERROR, #event ": %s\n", errbuff); \
goto fail; \
}
/* select format : favour native format
* We don't CHECK_IOCTL_ERROR here because even if failed OSS still may be
* usable. If OSS is not usable the SNDCTL_DSP_SETFMTS later is going to
* fail anyway. `err =` kept to eliminate compiler warning. */
* fail anyway. */
err = ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &tmp);
if (err < 0) {
av_log(s1, AV_LOG_WARNING, "SNDCTL_DSP_GETFMTS: %s\n", strerror(errno));