support for 3gp metadata

[ffmpeg] / libavdevice / audio.c

diff --git a/libavdevice/audio.c b/libavdevice/audio.c
index 6cd3313a90c6c0c9ccfe51b1864094f4cbf01d8f..4fcd3afea0d2f5150abab9919b150244374ef5d6 100644 (file)
--- a/libavdevice/audio.c
+++ b/libavdevice/audio.c
@@ -18,11 +18,13 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "avformat.h"
 
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <string.h>
+#include <errno.h>
 #ifdef HAVE_SOUNDCARD_H
 #include <soundcard.h>
 #else
@@ -31,11 +33,12 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
 #include <sys/time.h>
 
+#include "libavutil/log.h"
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
+
 #define AUDIO_BLOCK_SIZE 4096
 
 typedef struct {
@@ -312,7 +315,7 @@ static int audio_read_close(AVFormatContext *s1)
 #ifdef CONFIG_OSS_DEMUXER
 AVInputFormat oss_demuxer = {
     "oss",
-    "audio grab and output",
+    NULL_IF_CONFIG_SMALL("audio grab and output"),
     sizeof(AudioData),
     NULL,
     audio_read_header,
@@ -325,7 +328,7 @@ AVInputFormat oss_demuxer = {
 #ifdef CONFIG_OSS_MUXER
 AVOutputFormat oss_muxer = {
     "oss",
-    "audio grab and output",
+    NULL_IF_CONFIG_SMALL("audio grab and output"),
     "",
     "",
     sizeof(AudioData),