openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-23 19:30:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784'

Browse Source 
* commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784':
  build: Drop redundant check for soundcard.h

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-11 16:18:52 -03:00
commit fdd03d2d79
4 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -1934,7 +1934,6 @@ HEADERS_LIST="
opencv2_core_core_c_h opencv2_core_core_c_h
OpenGL_gl3_h OpenGL_gl3_h
poll_h poll_h
soundcard_h
stdatomic_h stdatomic_h
sys_param_h sys_param_h
sys_resource_h sys_resource_h
@ -3097,8 +3096,8 @@ libcdio_indev_deps="libcdio"
libdc1394_indev_deps="libdc1394" libdc1394_indev_deps="libdc1394"
openal_indev_deps="openal" openal_indev_deps="openal"
opengl_outdev_deps="opengl" opengl_outdev_deps="opengl"
oss_indev_deps_any="soundcard_h sys_soundcard_h" oss_indev_deps_any="sys_soundcard_h"
oss_outdev_deps_any="soundcard_h sys_soundcard_h" oss_outdev_deps_any="sys_soundcard_h"
pulse_indev_deps="libpulse" pulse_indev_deps="libpulse"
pulse_outdev_deps="libpulse" pulse_outdev_deps="libpulse"
sdl2_outdev_deps="sdl2" sdl2_outdev_deps="sdl2"
@ -6184,7 +6183,6 @@ else
audio_buf_info abc; audio_buf_info abc;
EOF EOF
fi fi
check_header soundcard.h
enabled alsa && check_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp || enabled alsa && check_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp ||
check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound

7
libavdevice/oss.c
View File

@ -23,17 +23,12 @@
#include <string.h> #include <string.h>
#if HAVE_SOUNDCARD_H
#include <soundcard.h>
#else
#include <sys/soundcard.h>
#endif
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/soundcard.h>
#include "libavutil/log.h" #include "libavutil/log.h"

7
libavdevice/oss_dec.c
View File

@ -23,17 +23,12 @@
#include <stdint.h> #include <stdint.h>
#if HAVE_SOUNDCARD_H
#include <soundcard.h>
#else
#include <sys/soundcard.h>
#endif
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/soundcard.h>
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"

7
libavdevice/oss_enc.c
View File

@ -21,17 +21,12 @@
#include "config.h" #include "config.h"
#if HAVE_SOUNDCARD_H
#include <soundcard.h>
#else
#include <sys/soundcard.h>
#endif
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/soundcard.h>
#include "libavutil/internal.h" #include "libavutil/internal.h"